From 161ea4ec1830918ffcdc088000ccd070fb9b9d68 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 5 Jan 2013 00:04:09 -0600 Subject: [PATCH] unbundled build fixes --- Crypto/samples/genrsakey/Makefile | 6 +++++- Crypto/testsuite/Makefile | 3 +++ Foundation/samples/Logger/Makefile | 5 +++++ Foundation/samples/deflate/Makefile | 5 +++++ Foundation/samples/grep/Makefile | 5 +++++ Foundation/samples/inflate/Makefile | 5 +++++ Foundation/testsuite/Makefile-Driver | 4 ++++ JSON/testsuite/Makefile | 4 ++++ Net/samples/EchoServer/Makefile | 7 ++++++- Net/samples/HTTPFormServer/Makefile | 6 +++++- Net/samples/HTTPLoadTest/Makefile | 6 +++++- Net/samples/HTTPTimeServer/Makefile | 6 +++++- Net/samples/Ping/Makefile | 6 +++++- Net/samples/SMTPLogger/Makefile | 4 ++++ Net/samples/TimeServer/Makefile | 6 +++++- Net/samples/TwitterClient/Makefile | 6 +++++- Net/samples/WebSocketServer/Makefile | 6 +++++- Net/testsuite/Makefile | 4 ++++ NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile | 6 +++++- PageCompiler/File2Page/Makefile | 2 +- PageCompiler/Makefile | 2 +- PageCompiler/samples/HTTPTimeServer/Makefile | 6 +++++- Util/samples/SampleApp/Makefile | 6 +++++- Util/samples/SampleServer/Makefile | 6 +++++- Util/samples/pkill/Makefile | 6 +++++- Util/testsuite/Makefile | 4 ++++ XML/samples/DOMParser/Makefile | 5 +++++ XML/samples/PrettyPrint/Makefile | 5 +++++ XML/samples/SAXParser/Makefile | 4 ++++ XML/testsuite/Makefile | 4 ++++ Zip/samples/unzip/Makefile | 6 +++++- Zip/samples/zip/Makefile | 6 +++++- 32 files changed, 144 insertions(+), 18 deletions(-) diff --git a/Crypto/samples/genrsakey/Makefile b/Crypto/samples/genrsakey/Makefile index 0de828282..f66663e85 100644 --- a/Crypto/samples/genrsakey/Makefile +++ b/Crypto/samples/genrsakey/Makefile @@ -18,6 +18,10 @@ objects = genrsakey target = genrsakey target_version = 1 -target_libs = PocoCrypto PocoUtil PocoXML PocoFoundation +target_libs = PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lpcre -lexpat +endif diff --git a/Crypto/testsuite/Makefile b/Crypto/testsuite/Makefile index e1702500c..3e4684bc8 100644 --- a/Crypto/testsuite/Makefile +++ b/Crypto/testsuite/Makefile @@ -13,6 +13,9 @@ ifeq ($(POCO_CONFIG),FreeBSD) SYSLIBS += -lssl -lcrypto -lz else SYSLIBS += -lssl -lcrypto -lz -ldl + ifeq ($(POCO_CONFIG),Linux) + SYSLIBS += -lkrb5 + endif endif objects = CryptoTestSuite Driver \ diff --git a/Foundation/samples/Logger/Makefile b/Foundation/samples/Logger/Makefile index 96742917e..79449502c 100644 --- a/Foundation/samples/Logger/Makefile +++ b/Foundation/samples/Logger/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz +endif + diff --git a/Foundation/samples/deflate/Makefile b/Foundation/samples/deflate/Makefile index 34a400dcf..9be1c8987 100644 --- a/Foundation/samples/deflate/Makefile +++ b/Foundation/samples/deflate/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz +endif + diff --git a/Foundation/samples/grep/Makefile b/Foundation/samples/grep/Makefile index d883d1390..96659184b 100644 --- a/Foundation/samples/grep/Makefile +++ b/Foundation/samples/grep/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lpcre +endif + diff --git a/Foundation/samples/inflate/Makefile b/Foundation/samples/inflate/Makefile index 3da12c077..e16f6afd2 100644 --- a/Foundation/samples/inflate/Makefile +++ b/Foundation/samples/inflate/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz +endif + diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver index 5645e3355..8f0a5626e 100644 --- a/Foundation/testsuite/Makefile-Driver +++ b/Foundation/testsuite/Makefile-Driver @@ -46,3 +46,7 @@ target_version = 1 target_libs = PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre +endif diff --git a/JSON/testsuite/Makefile b/JSON/testsuite/Makefile index 36149b2b3..0514f380f 100644 --- a/JSON/testsuite/Makefile +++ b/JSON/testsuite/Makefile @@ -15,3 +15,7 @@ target_version = 1 target_libs = PocoJSON PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lpcre -lexpat +endif diff --git a/Net/samples/EchoServer/Makefile b/Net/samples/EchoServer/Makefile index 062ea8061..a720f7297 100644 --- a/Net/samples/EchoServer/Makefile +++ b/Net/samples/EchoServer/Makefile @@ -12,6 +12,11 @@ objects = EchoServer target = EchoServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif + diff --git a/Net/samples/HTTPFormServer/Makefile b/Net/samples/HTTPFormServer/Makefile index e57ad9739..f3de901c1 100644 --- a/Net/samples/HTTPFormServer/Makefile +++ b/Net/samples/HTTPFormServer/Makefile @@ -12,6 +12,10 @@ objects = HTTPFormServer target = HTTPFormServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/HTTPLoadTest/Makefile b/Net/samples/HTTPLoadTest/Makefile index 6663013ca..eade29878 100644 --- a/Net/samples/HTTPLoadTest/Makefile +++ b/Net/samples/HTTPLoadTest/Makefile @@ -12,6 +12,10 @@ objects = HTTPLoadTest target = HTTPLoadTest target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/HTTPTimeServer/Makefile b/Net/samples/HTTPTimeServer/Makefile index 57cb5b69a..5e18a7104 100644 --- a/Net/samples/HTTPTimeServer/Makefile +++ b/Net/samples/HTTPTimeServer/Makefile @@ -12,6 +12,10 @@ objects = HTTPTimeServer target = HTTPTimeServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/Ping/Makefile b/Net/samples/Ping/Makefile index c9ec68193..c16abe8e5 100644 --- a/Net/samples/Ping/Makefile +++ b/Net/samples/Ping/Makefile @@ -12,6 +12,10 @@ objects = Ping target = Ping target_version = 1 -target_libs = PocoNet PocoUtil PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/SMTPLogger/Makefile b/Net/samples/SMTPLogger/Makefile index 3155c496a..e9edfca4a 100644 --- a/Net/samples/SMTPLogger/Makefile +++ b/Net/samples/SMTPLogger/Makefile @@ -15,3 +15,7 @@ target_version = 1 target_libs = PocoNet PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz +endif diff --git a/Net/samples/TimeServer/Makefile b/Net/samples/TimeServer/Makefile index e507e02a0..b8a6abebe 100644 --- a/Net/samples/TimeServer/Makefile +++ b/Net/samples/TimeServer/Makefile @@ -12,6 +12,10 @@ objects = TimeServer target = TimeServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/TwitterClient/Makefile b/Net/samples/TwitterClient/Makefile index af6463eb7..d5683dbeb 100644 --- a/Net/samples/TwitterClient/Makefile +++ b/Net/samples/TwitterClient/Makefile @@ -12,6 +12,10 @@ objects = Twitter TweetApp target = tweet target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/samples/WebSocketServer/Makefile b/Net/samples/WebSocketServer/Makefile index fcfcafd6f..f3c53dcb8 100644 --- a/Net/samples/WebSocketServer/Makefile +++ b/Net/samples/WebSocketServer/Makefile @@ -12,6 +12,10 @@ objects = WebSocketServer target = WebSocketServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index be3c6d90a..dabcca0c4 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -33,3 +33,7 @@ target_version = 1 target_libs = PocoNet PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz +endif diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile b/NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile index ede60b7b4..cdcb0a745 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile @@ -19,6 +19,10 @@ objects = HTTPSTimeServer target = HTTPSTimeServer target_version = 1 -target_libs = PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation +target_libs = PocoNetSSL PocoCrypto PocoNet PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lpcre -lexpat +endif diff --git a/PageCompiler/File2Page/Makefile b/PageCompiler/File2Page/Makefile index 8febd3214..30fd3b597 100644 --- a/PageCompiler/File2Page/Makefile +++ b/PageCompiler/File2Page/Makefile @@ -16,6 +16,6 @@ endif target = f2cpsp target_version = 1 -target_libs = PocoUtil PocoXML PocoFoundation +target_libs = PocoUtil PocoXML PocoJSON PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/PageCompiler/Makefile b/PageCompiler/Makefile index 29893a7ca..2f762fab6 100644 --- a/PageCompiler/Makefile +++ b/PageCompiler/Makefile @@ -18,6 +18,6 @@ endif target = cpspc target_version = 1 -target_libs = PocoNet PocoUtil PocoXML PocoFoundation +target_libs = PocoNet PocoUtil PocoXML PocoJSON PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/PageCompiler/samples/HTTPTimeServer/Makefile b/PageCompiler/samples/HTTPTimeServer/Makefile index ed45790d7..63489e786 100644 --- a/PageCompiler/samples/HTTPTimeServer/Makefile +++ b/PageCompiler/samples/HTTPTimeServer/Makefile @@ -15,10 +15,14 @@ objects = HTTPTimeServerApp TimeHandler target = HTTPTimeServer target_version = 1 -target_libs = PocoUtil PocoNet PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoNet PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif + # Rule for runnning PageCompiler src/%.cpp: src/%.cpsp @echo "** Compiling Page" $< diff --git a/Util/samples/SampleApp/Makefile b/Util/samples/SampleApp/Makefile index c128cb67d..98d4ee719 100644 --- a/Util/samples/SampleApp/Makefile +++ b/Util/samples/SampleApp/Makefile @@ -12,6 +12,10 @@ objects = SampleApp target = SampleApp target_version = 1 -target_libs = PocoUtil PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Util/samples/SampleServer/Makefile b/Util/samples/SampleServer/Makefile index bca4fa045..c457175c7 100644 --- a/Util/samples/SampleServer/Makefile +++ b/Util/samples/SampleServer/Makefile @@ -12,6 +12,10 @@ objects = SampleServer target = SampleServer target_version = 1 -target_libs = PocoUtil PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Util/samples/pkill/Makefile b/Util/samples/pkill/Makefile index 409746de5..605c33602 100644 --- a/Util/samples/pkill/Makefile +++ b/Util/samples/pkill/Makefile @@ -12,6 +12,10 @@ objects = pkill target = pkill target_version = 1 -target_libs = PocoUtil PocoXML PocoFoundation +target_libs = PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Util/testsuite/Makefile b/Util/testsuite/Makefile index e0dc4caaf..e79c22233 100644 --- a/Util/testsuite/Makefile +++ b/Util/testsuite/Makefile @@ -24,3 +24,7 @@ target_version = 1 target_libs = PocoUtil PocoXML PocoJSON PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/XML/samples/DOMParser/Makefile b/XML/samples/DOMParser/Makefile index 197b84dbc..1981277f1 100644 --- a/XML/samples/DOMParser/Makefile +++ b/XML/samples/DOMParser/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lexpat +endif + diff --git a/XML/samples/PrettyPrint/Makefile b/XML/samples/PrettyPrint/Makefile index e1242bda6..d5882be5f 100644 --- a/XML/samples/PrettyPrint/Makefile +++ b/XML/samples/PrettyPrint/Makefile @@ -15,3 +15,8 @@ target_version = 1 target_libs = PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lexpat +endif + diff --git a/XML/samples/SAXParser/Makefile b/XML/samples/SAXParser/Makefile index 40cd72802..073d23880 100644 --- a/XML/samples/SAXParser/Makefile +++ b/XML/samples/SAXParser/Makefile @@ -15,3 +15,7 @@ target_version = 1 target_libs = PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lexpat +endif diff --git a/XML/testsuite/Makefile b/XML/testsuite/Makefile index 875c85cf2..b71638b23 100644 --- a/XML/testsuite/Makefile +++ b/XML/testsuite/Makefile @@ -19,3 +19,7 @@ target_version = 1 target_libs = PocoXML PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lexpat +endif diff --git a/Zip/samples/unzip/Makefile b/Zip/samples/unzip/Makefile index 9ab8f4c3a..565941685 100644 --- a/Zip/samples/unzip/Makefile +++ b/Zip/samples/unzip/Makefile @@ -12,6 +12,10 @@ objects = unzip target = unzip target_version = 1 -target_libs = PocoZip PocoUtil PocoXML PocoFoundation +target_libs = PocoZip PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif diff --git a/Zip/samples/zip/Makefile b/Zip/samples/zip/Makefile index c43d3e9e9..1ab3e61b6 100644 --- a/Zip/samples/zip/Makefile +++ b/Zip/samples/zip/Makefile @@ -12,6 +12,10 @@ objects = zip target = zip target_version = 1 -target_libs = PocoZip PocoUtil PocoXML PocoFoundation +target_libs = PocoZip PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec + +ifdef POCO_UNBUNDLED + SYSLIBS += -lz -lpcre -lexpat +endif