aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-09-27 02:32:30 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-09-27 02:32:30 +0000
commit0dcff0d3d27c3c3c5f7904bb47b27fcd3e9ce039 (patch)
treef17337427d9367c6ad55389ba0cd1b7176d9ba85 /Makefile
parent69275635f1d8d1da49a418b5ee61aad4e6a43230 (diff)
make subdirs always build as appropriate
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1568 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d15b9fc2e..b904fa6b9 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`