From 0fc11c530a4e7fd0a67fd7b6f642672c86f2f052 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 7 Jan 2013 02:21:30 +0100 Subject: [PATCH] Re-generated Makefiles --- Makefile | 6 +++--- data/Makefile | 8 ++++---- doc/Makefile | 8 ++++---- include/App/Makefile | 8 ++++---- include/Makefile | 8 ++++---- src/Makefile | 16 ++++++++-------- src/transport/Makefile | 16 ++++++++-------- tests/Makefile | 12 ++++++------ tools/Makefile | 10 +++++----- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index bd320f0..f733ec3 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = libApp VERSION = 0.1.5 SUBDIRS = data doc include src src/transport tests tools -RM ?= rm -f -LN ?= ln -f -TAR ?= tar -czvf +RM = rm -f +LN = ln -f +TAR = tar -czvf all: subdirs diff --git a/data/Makefile b/data/Makefile index 9080bb0..f1baa9c 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,10 +1,10 @@ TARGETS = libApp.pc PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/doc/Makefile b/doc/Makefile index 548f2b8..65dcded 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,10 +2,10 @@ SUBDIRS = gtkdoc TARGETS = gtkdoc/libApp.types gtkdoc/tmpl.stamp gtkdoc/sgml.stamp gtkdoc/html.stamp PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: subdirs $(TARGETS) diff --git a/include/App/Makefile b/include/App/Makefile index 0d13479..fcb3dd8 100644 --- a/include/App/Makefile +++ b/include/App/Makefile @@ -1,9 +1,9 @@ PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install INCLUDEDIR= $(PREFIX)/include diff --git a/include/Makefile b/include/Makefile index 0bf7dd3..b0190f6 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,10 +1,10 @@ SUBDIRS = App PREFIX = /usr/local DESTDIR = -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install INCLUDEDIR= $(PREFIX)/include diff --git a/src/Makefile b/src/Makefile index 5204aa0..abe7869 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,20 +2,20 @@ TARGETS = libApp.a libApp.so.0.0 libApp.so.0 libApp.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc +CC = cc CPPFLAGSF= -I ../include CPPFLAGS= -I $(PREFIX)/include CFLAGSF = -W -fPIC `pkg-config --cflags libSystem` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= `pkg-config --libs libSystem` LDFLAGS = -AR ?= ar -RANLIB ?= ranlib -CCSHARED?= $(CC) -shared -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +AR = ar +RANLIB = ranlib +CCSHARED= $(CC) -shared +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/src/transport/Makefile b/src/transport/Makefile index 4f13729..351b7ea 100644 --- a/src/transport/Makefile +++ b/src/transport/Makefile @@ -2,18 +2,18 @@ TARGETS = tcp.so tcp4.so tcp6.so template.so udp.so udp4.so udp6.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib -CC ?= cc +CC = cc CPPFLAGSF= -I ../../include CPPFLAGS= CFLAGSF = -W -fPIC CFLAGS = -Wall -g -O2 -pedantic -AR ?= ar -RANLIB ?= ranlib -CCSHARED?= $(CC) -shared -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +AR = ar +RANLIB = ranlib +CCSHARED= $(CC) -shared +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/tests/Makefile b/tests/Makefile index d8e4b8a..9029050 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -3,17 +3,17 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc +CC = cc CPPFLAGSF= -I ../include -CPPFLAGS?= +CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libSystem` CFLAGS = -Wall -g -O2 LDFLAGSF= `pkg-config --libs libSystem` -lApp LDFLAGS = -L../src -Wl,-rpath,../src -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS) diff --git a/tools/Makefile b/tools/Makefile index e6f1bef..5fad486 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,17 +3,17 @@ PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin -CC ?= cc +CC = cc CPPFLAGSF= -I ../include CPPFLAGS= CFLAGSF = -W `pkg-config --cflags libSystem` CFLAGS = -Wall -g -O2 -pedantic LDFLAGSF= -L../src `pkg-config --libs libSystem` -lApp LDFLAGS = -L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -RM ?= rm -f -LN ?= ln -f -MKDIR ?= mkdir -p -INSTALL ?= install +RM = rm -f +LN = ln -f +MKDIR = mkdir -p +INSTALL = install all: $(TARGETS)