[asterisk-commits] qwell: branch qwell/pjproject-cleanup r380026 - in /team/qwell/pjproject-clea...

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jan 23 17:16:31 2013
New Revision: 380026

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380026
Log:
Revert r378582, fix it by passing AR with flags.

Modified:
    team/qwell/pjproject-cleanup/res/Makefile
    team/qwell/pjproject-cleanup/res/pjproject/aconfigure
    team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac
    team/qwell/pjproject-cleanup/res/pjproject/build/common.mak

Modified: team/qwell/pjproject-cleanup/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/Makefile?view=diff&rev=380026&r1=380025&r2=380026
==============================================================================
--- team/qwell/pjproject-cleanup/res/Makefile (original)
+++ team/qwell/pjproject-cleanup/res/Makefile Wed Jan 23 17:16:31 2013
@@ -67,14 +67,14 @@
 ael/pval.o: ael/pval.c
 
 clean::
-	$(MAKE) -C pjproject realclean
+	@if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
 	rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
 
 dist-clean::
 	rm -f pjproject/build.mak
 
-pjproject/build.mak:
-	(cd pjproject && AR="$(AR)" CFLAGS="-fPIC $(_ASTCFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
+pjproject/build.mak: pjproject/aconfigure
+	(cd pjproject && AR="$(AR) rv" CFLAGS="-fPIC $(_ASTCFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
 
 -include pjproject/build.mak
 

Modified: team/qwell/pjproject-cleanup/res/pjproject/aconfigure
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/aconfigure?view=diff&rev=380026&r1=380025&r2=380026
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/aconfigure (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/aconfigure Wed Jan 23 17:16:31 2013
@@ -2401,7 +2401,7 @@
   program_prefix=${target_alias}-
 ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
 
-ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
+ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
 
 
 
@@ -7799,6 +7799,7 @@
     "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
     "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
     "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
+    "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
     "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
     "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
     "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;

Modified: team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac?view=diff&rev=380026&r1=380025&r2=380026
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac Wed Jan 23 17:16:31 2013
@@ -13,6 +13,7 @@
 		 ])
 AC_CONFIG_FILES([build.mak 
 		 build/os-auto.mak 
+		 build/cc-auto.mak
 		 pjlib/build/os-auto.mak 
 		 pjlib-util/build/os-auto.mak 
 		 pjmedia/build/os-auto.mak

Modified: team/qwell/pjproject-cleanup/res/pjproject/build/common.mak
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/build/common.mak?view=diff&rev=380026&r1=380025&r2=380026
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/build/common.mak (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/build/common.mak Wed Jan 23 17:16:31 2013
@@ -15,6 +15,15 @@
 # located in this directory.
 #
 -include cc-$(CC_NAME).mak
+
+#
+# Include auto configured compiler specification.
+# This will override the compiler settings above.
+# Currently this is made OPTIONAL, to prevent people
+# from getting errors because they don't re-run ./configure
+# after downloading new PJSIP.
+#
+-include $(PJDIR)/build/cc-auto.mak
 
 #
 # Include global machine specific definitions