[asterisk-commits] branch group/autoconf_and_menuselect r21778 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Apr 20 18:55:22 2006
New Revision: 21778

URL: http://svn.digium.com/view/asterisk?rev=21778&view=rev
Log:
shorten compiler commands by using relative paths for forced include files

Modified:
    team/group/autoconf_and_menuselect/Makefile
    team/group/autoconf_and_menuselect/codecs/Makefile

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=21778&r1=21777&r2=21778&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Thu Apr 20 18:55:22 2006
@@ -195,12 +195,15 @@
   include makeopts
 endif
 
-ASTCFLAGS+=$(MENUSELECT_CFLAGS) -include $(PWD)/include/autoconfig.h
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h
+SUBDIR_CFLAGS=-include ../include/autoconfig.h
 
 #   *CLI> show memory allocations [filename]
 #   *CLI> show memory summary [filename]
 ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
-  AST_CFLAGS+=-include $(PWD)/include/asterisk/astmm.h
+  TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+  SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
 endif
 
 ifeq ($(OSARCH),Linux)
@@ -402,7 +405,7 @@
 endif
 
 ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-  CFLAGS+=$(ASTCFLAGS)
+  CFLAGS+=$(ASTCFLAGS) $(TOPDIR_CFLAGS)
 endif
 
 # This is used when generating the doxygen documentation
@@ -507,10 +510,7 @@
 	rm -f $@.tmp
 
 stdtime/libtime.a:
-	$(MAKE) -C stdtime libtime.a
-
-cygwin_a:
-	$(MAKE) -C cygwin all
+	CFLAGS="$(ASTCFLAGS) $(SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
 
 asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
 	build_tools/make_build_h > include/asterisk/build.h.tmp
@@ -525,7 +525,7 @@
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
-	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+	for x in $(SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
 
 clean-depend:
 	for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -652,7 +652,6 @@
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
 	if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-	if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
 	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
 	ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/

Modified: team/group/autoconf_and_menuselect/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/Makefile?rev=21778&r1=21777&r2=21778&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/Makefile Thu Apr 20 18:55:22 2006
@@ -69,19 +69,19 @@
 	$(MAKE) -C ilbc clean
 
 $(LIBG723):
-	$(MAKE) -C g723.1 all
+	CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1 all
 
 $(LIBGSM):
-	$(MAKE) -C gsm lib/libgsm.a
+	CFLAGS="$(ASTCFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a
 
 $(LIBG723B):
-	$(MAKE) -C g723.1b all
+	CFLAGS="$(ASTCFLAGS)" $(MAKE) -C g723.1b all
 
 $(LIBLPC10):
-	$(MAKE) -C lpc10 all
+	CFLAGS="$(ASTCFLAGS)" $(MAKE) -C lpc10 all
 
 $(LIBILBC):
-	$(MAKE) -C ilbc all
+	CFLAGS="$(ASTCFLAGS)" $(MAKE) -C ilbc all
 
 codec_ilbc.so: codec_ilbc.o $(LIBILBC)
 	$(CC) $(SOLINK) -o $@ $< $(LIBILBC)