kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 02:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

there is no reason to build and link stdtime/libtime.a because we already

Browse Source 
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
This commit is contained in:
Russell Bryant
2006-06-18 20:33:53 +00:00
parent 035a8b4278
commit 9843e16df2
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -277,7 +277,7 @@ endif
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
OTHER_SUBDIRS=utils stdtime agi OTHER_SUBDIRS=utils agi
SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS) SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ 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 fi
@rm -f $@.tmp @rm -f $@.tmp
stdtime/libtime.a: asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a $(OBJS)
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)
build_tools/make_build_h > include/asterisk/build.h.tmp 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 \ 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 ; \ mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
fi fi
rm -f include/asterisk/build.h.tmp rm -f include/asterisk/build.h.tmp
$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c $(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 muted: muted.o
$(CC) $(AUDIO_LIBS) -o muted muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o