unbundled build fixes

luffyhwl · Jan 5, 2013 · 161ea4e · 161ea4e
1 parent 8a44e75
commit 161ea4e
Show file tree

Hide file tree

Showing 32 changed files with 144 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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