diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-11 09:50:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-11 09:50:41 +0000 |
| commit | 26a2b7c6d573ffeb1dcd690a5cf50223dee90e1b (patch) | |
| tree | f6300a9342ef9cdd3cad0c92b46bf88332b4f55d /Makefile | |
| parent | 23875cea7917001e9fe79c4fdbb6ba6b9b04dc9a (diff) | |
change the CFLAGS controlled by menuselect to be placed in a header file
instead of being added to the compiler commands. This header file will be
installed and modules built outside of the main tree will be able to use the
same build options used to build the rest of Asterisk.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26808 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -195,7 +195,6 @@ ifneq ($(wildcard makeopts),) include makeopts endif -ASTCFLAGS+=$(MENUSELECT_CFLAGS) TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I.. OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I.. @@ -432,7 +431,7 @@ _all: all @echo " + make install +" @echo " +-------------------------------------------+" -all: config.status menuselect.makeopts cleantest depend asterisk subdirs +all: cleantest config.status menuselect.makeopts depend asterisk subdirs config.status: configure @CFLAGS="" ./configure @@ -525,10 +524,17 @@ include/asterisk/version.h: fi @rm -f $@.tmp +include/asterisk/buildopts.h: menuselect.makeopts + @build_tools/make_buildopts_h > $@.tmp + @if cmp -s $@.tmp $@ ; then echo; else \ + mv $@.tmp $@ ; \ + fi + @rm -f $@.tmp + stdtime/libtime.a: CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a -asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) +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 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 ; \ @@ -567,6 +573,7 @@ dist-clean: clean rm -f menuselect.makeopts makeopts makeopts.xml rm -f config.log config.status rm -f include/autoconfig.h + rm -f include/asterisk/buildopts.h $(MAKE) -C mxml clean $(MAKE) -C build_tools dist-clean @@ -862,7 +869,7 @@ spec: rpm: __rpm -__rpm: include/asterisk/version.h spec +__rpm: include/asterisk/version.h include/asterisk/buildopts.h spec rm -rf /tmp/asterisk ; \ mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ $(MAKE) DESTDIR=/tmp/asterisk install ; \ @@ -911,10 +918,10 @@ dont-optimize: _all valgrind: dont-optimize -depend: include/asterisk/version.h .depend defaults.h +depend: include/asterisk/version.h include/asterisk/buildopts.h .depend defaults.h @for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done -.depend: include/asterisk/version.h defaults.h +.depend: include/asterisk/version.h include/asterisk/buildopts.h defaults.h build_tools/mkdep $(CFLAGS) $(wildcard *.c) .tags-depend: @@ -958,7 +965,7 @@ env: cleantest: @if cmp -s .cleancount .lastclean ; then echo ; else \ - $(MAKE) clean; cp -f .cleancount .lastclean;\ + $(MAKE) dist-clean; cp -f .cleancount .lastclean;\ fi _uninstall: |