diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-18 20:33:53 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-18 20:33:53 +0000 |
| commit | 0dd66d06730eb7a08d8f69df3a1960337c9f0346 (patch) | |
| tree | 456bd53f4570719206ad5f674fc2608ae4351ab2 /Makefile | |
| parent | 0d41f64569cbd1c2238f956f958c754b158e18da (diff) | |
there is no reason to build and link stdtime/libtime.a because we already
directly include stdtime/localtime.o in the OBJS for asterisk, which is the
only object file for libtime
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34629 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -277,7 +277,7 @@ endif ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs -OTHER_SUBDIRS=utils stdtime agi +OTHER_SUBDIRS=utils agi SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS) OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ @@ -477,17 +477,14 @@ include/asterisk/buildopts.h: menuselect.makeopts fi @rm -f $@.tmp -stdtime/libtime.a: - CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a - -asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) +asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a $(OBJS) build_tools/make_build_h > include/asterisk/build.h.tmp if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ fi rm -f include/asterisk/build.h.tmp $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c - $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) + $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(LIBS) muted: muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o |