Util depends on JSON. So build JSON before Util

dejing · May 11, 2012 · d63e94c · d63e94c
1 parent 6e51d78
commit d63e94c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -44,9 +44,9 @@ install: libexecs
 	find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
 	find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
 
-libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec CppParser-libexec JSON-libexec
-tests    =  Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests JSON-tests
-samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples JSON-samples
+libexecs =  Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec CppParser-libexec
+tests    =  Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests
+samples  =  Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples
 
 .PHONY: $(libexecs)
 .PHONY: $(tests)
@@ -74,6 +74,15 @@ XML-tests: XML-libexec cppunit
 XML-samples: XML-libexec 
 	$(MAKE) -C $(POCO_BASE)/XML/samples
 
+JSON-libexec:  Foundation-libexec
+	$(MAKE) -C $(POCO_BASE)/JSON
+
+JSON-tests: JSON-libexec cppunit
+	$(MAKE) -C $(POCO_BASE)/JSON/testsuite
+
+#JSON-samples: JSON-libexec 
+#	$(MAKE) -C $(POCO_BASE)/JSON/samples
+
 Util-libexec:  Foundation-libexec XML-libexec
 	$(MAKE) -C $(POCO_BASE)/Util
 
@@ -170,15 +179,6 @@ CppParser-libexec: Foundation-libexec
 CppParser-tests: CppParser-libexec 
 	$(MAKE) -C $(POCO_BASE)/CppParser/testsuite
 
-JSON-libexec:  Foundation-libexec
-	$(MAKE) -C $(POCO_BASE)/JSON
-
-JSON-tests: JSON-libexec cppunit
-	$(MAKE) -C $(POCO_BASE)/JSON/testsuite
-
-#JSON-samples: JSON-libexec 
-#	$(MAKE) -C $(POCO_BASE)/JSON/samples
-
 
 clean:
 	$(MAKE) -C $(POCO_BASE)/Foundation clean

diff --git a/components b/components
@@ -1,6 +1,7 @@
 CppUnit
 Foundation
 XML
+JSON
 Util
 Net
 Crypto
@@ -17,4 +18,3 @@ PDF
 CppParser
 PocoDoc
 ProGen
-JSON