diff --git a/Makefile b/Makefile index d15b9fc2ed..b904fa6b91 100755 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ all: depend asterisk subdirs editline/config.h: cd editline && unset CFLAGS LIBS && ./configure ; \ -editline/libedit.a: editline/config.h +editline/libedit.a: $(MAKE) -C editline libedit.a db1-ast/libdb1.a: @@ -194,16 +194,16 @@ build.h: ./make_build_h endif -stdtime/localtime.o: +stdtime/libtime.a: @if [ -d stdtime ]; then \ - $(MAKE) -C stdtime; \ + $(MAKE) -C stdtime libtime.a ; \ else \ echo "You need to do a cvs update -d not just cvs update"; \ exit 1; \ fi -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/localtime.o $(OBJS) - $(CC) $(DEBUG) -o asterisk -Wl,-E $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/localtime.o +asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) + $(CC) $(DEBUG) -o asterisk -Wl,-E $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a subdirs: for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done @@ -412,6 +412,6 @@ valgrind: dont-optimize depend: .depend for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done -.depend: build.h +.depend: ./mkdep ${CFLAGS} `ls *.c` diff --git a/stdtime/Makefile b/stdtime/Makefile index fede0651e5..927f07dedc 100755 --- a/stdtime/Makefile +++ b/stdtime/Makefile @@ -1,19 +1,26 @@ - CC=gcc #CFLAGS=-Wall INCLUDE=-I../include -all: localtime.o +OBJS=localtime.o -clean:: - rm -f localtime.o test +all: libtime.a -depend:: - @echo "Nothing to do for depend" +libtime.a: $(OBJS) + ar rv $@ $(OBJS) + ranlib $@ + +clean: + rm -f libtime.a *.o test + +depend: .depend + +.depend: + ../mkdep $(CFLAGS) *.c test: test.c ${CC} ${CFLAGS} -o test test.c -localtime.o: localtime.c - - +ifneq ($(wildcard .depend),) +include .depend +endif