[asterisk-commits] qwell: branch qwell/pjproject-cleanup r380021 - /team/qwell/pjproject-cleanup...

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jan 23 15:43:09 2013
New Revision: 380021

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380021
Log:
Allow parallel builds.  Pass in our CFLAGS.  Build only as much as we need.

Modified:
    team/qwell/pjproject-cleanup/res/Makefile

Modified: team/qwell/pjproject-cleanup/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/Makefile?view=diff&rev=380021&r1=380020&r2=380021
==============================================================================
--- team/qwell/pjproject-cleanup/res/Makefile (original)
+++ team/qwell/pjproject-cleanup/res/Makefile Wed Jan 23 15:43:09 2013
@@ -70,18 +70,20 @@
 	$(MAKE) -C pjproject realclean
 	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 && ./configure AR="" CFLAGS=-fPIC  --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
+	(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)
 
-.PHONY : pjproject
-pjproject: pjproject/build.mak
-	# Make sure we always build pjproject with a single job.
-	$(MAKE) -j1 -C pjproject dep
-	$(MAKE) -j1 -C pjproject
+-include pjproject/build.mak
 
-include pjproject/build.mak
+.PHONY: FORCE
+FORCE:
 
-$(PJ_LIB_FILES): pjproject
+$(PJ_LIB_FILES): pjproject/build.mak FORCE
+	$(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
+
 res_rtp_asterisk.o: $(PJ_LIB_FILES)
 res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
 res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)