From: Russell Bryant Date: Sun, 18 Jun 2006 20:33:53 +0000 (+0000) Subject: there is no reason to build and link stdtime/libtime.a because we already X-Git-Tag: 1.4.0-beta1~861 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9843e16df21dd5511f250ab382dcff8a1d55c462;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@34629 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 6959e2184c..5e91c4a7c4 100644 --- a/Makefile +++ b/Makefile @@ -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