[Asterisk-cvs] asterisk Makefile,1.31,1.32
markster at lists.digium.com
markster at lists.digium.com
Fri Sep 26 21:31:18 CDT 2003
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv19355
Modified Files:
Makefile
Log Message:
make subdirs always build as appropriate
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile 27 Sep 2003 00:32:01 -0000 1.31
+++ Makefile 27 Sep 2003 02:32:30 -0000 1.32
@@ -155,7 +155,7 @@
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 @@
./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 @@
depend: .depend
for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
-.depend: build.h
+.depend:
./mkdep ${CFLAGS} `ls *.c`
More information about the svn-commits
mailing list