From 61d90aa7b95017eab04c5446b822a5df581966e7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 25 Aug 2004 11:42:11 +0000 Subject: [PATCH] Makefiles generated by configure --- Makefile | 32 +++++++++----------------------- src/Makefile | 10 +++++----- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index dc54d2a..35ba354 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,14 @@ -PACKAGE = configure -VERSION = 0.0.1 SUBDIRS = src -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin -all clean distclean: - @for i in $(SUBDIRS); do make -C $$i $@ || exit $$?; done +all: subdirs -install: all - @for i in $(SUBDIRS); do make -C $$i PREFIX=$(PREFIX) BINDIR=$(BINDIR) $@ || exit $$?; done +subdirs: + @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done -dist: distclean - $(RM) -r $(PACKAGE)-$(VERSION) - ln -s . $(PACKAGE)-$(VERSION) - tar -czf $(PACKAGE)-$(VERSION).tar.gz \ - $(PACKAGE)-$(VERSION)/project.conf \ - $(PACKAGE)-$(VERSION)/Makefile \ - $(PACKAGE)-$(VERSION)/AUTHORS \ - $(PACKAGE)-$(VERSION)/BUGS \ - $(PACKAGE)-$(VERSION)/COPYING \ - $(PACKAGE)-$(VERSION)/INSTALL \ - $(PACKAGE)-$(VERSION)/README \ - $(PACKAGE)-$(VERSION)/src/project.conf \ - $(PACKAGE)-$(VERSION)/src/Makefile \ - $(PACKAGE)-$(VERSION)/src/*.c - $(RM) $(PACKAGE)-$(VERSION) + +clean: + @for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done + +distclean: clean + @for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done diff --git a/src/Makefile b/src/Makefile index dcc6810..6131d25 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,18 +3,21 @@ CFLAGSF = -W -Wall -ansi CFLAGS = -g LDFLAGSF= -lutils CC = cc +AR = ar rc +RANLIB = ranlib +LD = ld -shared RM = rm -f -INSTALL = install all: $(TARGETS) configure_OBJS= configure.o +configure_CFLAGS=$(CFLAGSF) $(CFLAGS) configure: $(configure_OBJS) $(CC) $(LDFLAGSF) $(LDFLAGS) -o configure $(configure_OBJS) configure.o: configure.c - $(CC) $(CFLAGSF) $(CFLAGS) -c configure.c + $(CC) $(configure_CFLAGS) -c configure.c clean: @@ -22,6 +25,3 @@ clean: distclean: clean $(RM) $(TARGETS) - -install: all - $(INSTALL) -m 755 configure $(DESTDIR)$(BINDIR)