diff options
author | Liong Sauw Ming <ming@teluu.com> | 2012-12-13 06:37:05 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2012-12-13 06:37:05 +0000 |
commit | a23dc6874b339204d549526b22353e319ade4bac (patch) | |
tree | fbb3cb9aa17fdf140f931b884c7ebe160df8cb9d | |
parent | 72492166311a076ff4ce8f8656809c50fa126b1f (diff) |
Re #1559: Fix dependencies when running parallel make (thanks Shaun Ruffell for the patch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4308 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib-util/build/Makefile | 2 | ||||
-rw-r--r-- | pjlib/build/Makefile | 2 | ||||
-rw-r--r-- | pjmedia/build/Makefile | 4 | ||||
-rw-r--r-- | pjnath/build/Makefile | 2 | ||||
-rw-r--r-- | pjsip/build/Makefile | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile index fba93bb3..d2ad65a8 100644 --- a/pjlib-util/build/Makefile +++ b/pjlib-util/build/Makefile @@ -74,7 +74,7 @@ distclean: realclean pjlib-util: $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB) -pjlib-util-test: +pjlib-util-test: pjlib-util $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE) .PHONY: ../lib/pjlib-util.ko diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 91836445..a36f5f44 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -87,7 +87,7 @@ pjlib: ../include/pj/config_site.h ../include/pj/config_site.h: touch ../include/pj/config_site.h -pjlib-test: +pjlib-test: pjlib $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(TEST_EXE) .PHONY: ../lib/pjlib.ko diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index fab6a895..e9e04fcf 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -173,7 +173,9 @@ pjmedia-audiodev: pjsdp: $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB) -pjmedia-test: $(PJMEDIA_LIB) +$(PJMEDIA_LIB): pjmedia + +pjmedia-test: $(PJMEDIA_LIB) pjmedia $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE) .PHONY: ../lib/pjmedia.ko diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 573d9579..66017c79 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -97,6 +97,8 @@ distclean: realclean pjnath: $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB) +$$(PJNATH_LIB): pjnath + pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE) diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 2605be05..0f8fd13d 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -138,7 +138,7 @@ pjsip-simple: pjsua-lib: $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB) -pjsip-test: +pjsip-test: pjsip $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE) .PHONY: ../lib/pjsip.ko |