diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-22 04:44:43 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-22 04:44:43 +0000 |
| commit | b3ffca3af44835eab41a281d814bf622851b9b51 (patch) | |
| tree | 21504d10c645c3edfff735240f3e790d7afe5916 | |
| parent | 98620b2aefeee5ae15f15e63d84c091328f86fc2 (diff) | |
Let's have build.h created a bit earlier so that func_version can use it and not stop the build on a fresh machine that has never had Asterisk installed on it before...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45847 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | main/Makefile | 5 |
2 files changed, 8 insertions, 6 deletions
@@ -332,6 +332,13 @@ include/asterisk/buildopts.h: menuselect.makeopts fi @rm -f $@.tmp +include/asterisk/build.h: + @build_tools/make_build_h > $@.tmp + @if cmp -s $@.tmp $@ ; then : ; else \ + mv $@.tmp $@ ; \ + fi + @rm -f $@.tmp + $(SUBDIRS_CLEAN_DEPEND): @$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend @@ -624,7 +631,7 @@ $(MOD_SUBDIRS_DEPEND): $(OTHER_SUBDIRS_DEPEND): @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend -depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h $(SUBDIRS_DEPEND) +depend: include/asterisk/version.h include/asterisk/buildopts.h include/asterisk/build.h defaults.h $(SUBDIRS_DEPEND) sounds: $(MAKE) -C sounds all diff --git a/main/Makefile b/main/Makefile index c2e8ef6e0..4a47104f2 100644 --- a/main/Makefile +++ b/main/Makefile @@ -126,11 +126,6 @@ else endif asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) - @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp - @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \ - mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \ - fi - @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) |