From d1b7f14dd5cd17719fb57746a4c3f3074545208a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 5 Mar 2016 17:56:32 +0100 Subject: [PATCH] Avoid building Data/PostgreSQL on Cygwin since the lib front end does not exist. Signed-off-by: FrancisANDRE --- Makefile | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 683472445..b45e627f0 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,13 @@ poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples) all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Data/PostgreSQL MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF + +COMPONENTS = CppUnit Foundation XML JSON Util Net Crypto NetSSL_OpenSSL +COMPONENTS += Data Data/SQLite Data/ODBC Data/MySQL +ifneq ($(OSNAME), Cygwin) +COMPONENTS += Data/PostgreSQL +endif +COMPONENTS += MongoDB Redis Zip PageCompiler PageCompiler/File2Page CppParser PDF cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit @@ -99,11 +105,36 @@ endif find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; -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 Data/PostgreSQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-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 Data/PostgreSQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests -samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples -cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean Data/PostgreSQL-clean MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean +# ------------------------------------------------------------------------------------------------------------------------------------- +libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec +libexecs += Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec +ifneq ($(OSNAME), Cygwin) +libexecs += Data/PostgreSQL-libexec +endif +libexecs += MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec +# ------------------------------------------------------------------------------------------------------------------------------------- +tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests +tests += Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests +ifneq ($(OSNAME), Cygwin) +tests += Data/PostgreSQL-tests +endif +tests += MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests + +# ------------------------------------------------------------------------------------------------------------------------------------- +samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples +samples += Data-samples +samples += MongoDB-samples Zip-samples PageCompiler-samples PDF-samples + +# ------------------------------------------------------------------------------------------------------------------------------------- +cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean +cleans += Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean +ifneq ($(OSNAME), Cygwin) +cleans += Data/PostgreSQL-clean +endif +cleans += MongoDB-clean Redis-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean + +# ------------------------------------------------------------------------------------------------------------------------------------- .PHONY: $(libexecs) .PHONY: $(tests) .PHONY: $(samples)