Permalink
Browse files

Fix unbundled builds on Linux.

  • Loading branch information...
1 parent 0072b29 commit bec3e883afb6925f97f6f9c61a4176290e168047 @pprindeville committed Jan 1, 2013
View
6 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
View
3 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 \
View
5 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
+
View
5 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
+
View
5 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
+
View
5 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
+
View
4 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
View
4 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
View
7 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
+
View
6 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
View
6 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
View
6 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
View
6 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
View
4 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
View
6 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
View
6 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
View
6 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
View
4 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
View
6 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
View
6 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" $<
View
6 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
View
6 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
View
6 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
View
4 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
View
5 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
+
View
5 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
+
View
4 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
View
4 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
View
6 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
View
6 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

1 comment on commit bec3e88

@pprindeville

Please pull upstream.

Note that Crypto and Data don't build because of other linkage issues involving libkrb5.a and libsqlite3.a

Please sign in to comment.