From ba0e2154706e09a2d5e3c88aac42e621e8130a66 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 16 Sep 2011 11:36:26 +0000 Subject: [PATCH] Re-generated Makefiles --- Makefile | 8 ++++---- data/Makefile | 8 ++++---- include/Makefile | 8 ++++---- include/System/Makefile | 8 ++++---- src/Makefile | 18 +++++++++--------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 1e31d5d..d55ef41 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ PACKAGE = libSystem VERSION = 0.1.6 SUBDIRS = data include src -RM = rm -f -LN = ln -f -TAR = tar -czvf +RM ?= rm -f +LN ?= ln -f +TAR ?= tar -czvf all: subdirs @@ -20,7 +20,7 @@ distclean: dist: $(RM) -r -- $(PACKAGE)-$(VERSION) $(LN) -s -- . $(PACKAGE)-$(VERSION) - @$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \ + $(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \ $(PACKAGE)-$(VERSION)/data/Makefile \ $(PACKAGE)-$(VERSION)/data/libSystem.pc.in \ $(PACKAGE)-$(VERSION)/data/pkgconfig.sh \ diff --git a/data/Makefile b/data/Makefile index 4064eb9..cdee0a5 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,10 +1,10 @@ TARGETS = libSystem.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/include/Makefile b/include/Makefile index 21b1df0..b5e8268 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,10 +1,10 @@ SUBDIRS = System 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/System/Makefile b/include/System/Makefile index dc08297..bf9b3b2 100644 --- a/include/System/Makefile +++ b/include/System/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/src/Makefile b/src/Makefile index f90ab21..c8293cd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,13 +7,13 @@ CPPFLAGSF= -I ../include CPPFLAGS= CFLAGSF = -W -fPIC CFLAGS = -g -Wall -O2 -pedantic -AR = ar -rc -RANLIB = ranlib -LD = $(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) @@ -23,11 +23,11 @@ libSystem_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) libSystem.a: $(libSystem_OBJS) - $(AR) libSystem.a $(libSystem_OBJS) + $(AR) -rc libSystem.a $(libSystem_OBJS) $(RANLIB) libSystem.a libSystem.so: $(libSystem_OBJS) - $(LD) -o libSystem.so -Wl,-soname,libSystem.so.0 $(libSystem_OBJS) $(libSystem_LDFLAGS) + $(CCSHARED) -o libSystem.so -Wl,-soname,libSystem.so.0 $(libSystem_OBJS) $(libSystem_LDFLAGS) array.o: array.c $(CC) $(libSystem_CFLAGS) -c array.c