Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix unbundled builds on Linux.

  • Loading branch information...
commit bec3e883afb6925f97f6f9c61a4176290e168047 1 parent 0072b29
Philip Prindeville authored
Showing with 142 additions and 16 deletions.
  1. +5 −1 Crypto/samples/genrsakey/Makefile
  2. +3 −0  Crypto/testsuite/Makefile
  3. +5 −0 Foundation/samples/Logger/Makefile
  4. +5 −0 Foundation/samples/deflate/Makefile
  5. +5 −0 Foundation/samples/grep/Makefile
  6. +5 −0 Foundation/samples/inflate/Makefile
  7. +4 −0 Foundation/testsuite/Makefile-Driver
  8. +4 −0 JSON/testsuite/Makefile
  9. +6 −1 Net/samples/EchoServer/Makefile
  10. +5 −1 Net/samples/HTTPFormServer/Makefile
  11. +5 −1 Net/samples/HTTPLoadTest/Makefile
  12. +5 −1 Net/samples/HTTPTimeServer/Makefile
  13. +5 −1 Net/samples/Ping/Makefile
  14. +4 −0 Net/samples/SMTPLogger/Makefile
  15. +5 −1 Net/samples/TimeServer/Makefile
  16. +5 −1 Net/samples/TwitterClient/Makefile
  17. +5 −1 Net/samples/WebSocketServer/Makefile
  18. +4 −0 Net/testsuite/Makefile
  19. +5 −1 NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile
  20. +5 −1 PageCompiler/samples/HTTPTimeServer/Makefile
  21. +5 −1 Util/samples/SampleApp/Makefile
  22. +5 −1 Util/samples/SampleServer/Makefile
  23. +5 −1 Util/samples/pkill/Makefile
  24. +4 −0 Util/testsuite/Makefile
  25. +5 −0 XML/samples/DOMParser/Makefile
  26. +5 −0 XML/samples/PrettyPrint/Makefile
  27. +4 −0 XML/samples/SAXParser/Makefile
  28. +4 −0 XML/testsuite/Makefile
  29. +5 −1 Zip/samples/unzip/Makefile
  30. +5 −1 Zip/samples/zip/Makefile
6 Crypto/samples/genrsakey/Makefile
View
@@ -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
3  Crypto/testsuite/Makefile
View
@@ -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 \
5 Foundation/samples/Logger/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz
+endif
+
5 Foundation/samples/deflate/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz
+endif
+
5 Foundation/samples/grep/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lpcre
+endif
+
5 Foundation/samples/inflate/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz
+endif
+
4 Foundation/testsuite/Makefile-Driver
View
@@ -46,3 +46,7 @@ target_version = 1
target_libs = PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz -lpcre
+endif
4 JSON/testsuite/Makefile
View
@@ -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
7 Net/samples/EchoServer/Makefile
View
@@ -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
+
6 Net/samples/HTTPFormServer/Makefile
View
@@ -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
6 Net/samples/HTTPLoadTest/Makefile
View
@@ -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
6 Net/samples/HTTPTimeServer/Makefile
View
@@ -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
6 Net/samples/Ping/Makefile
View
@@ -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
4 Net/samples/SMTPLogger/Makefile
View
@@ -15,3 +15,7 @@ target_version = 1
target_libs = PocoNet PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz
+endif
6 Net/samples/TimeServer/Makefile
View
@@ -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
6 Net/samples/TwitterClient/Makefile
View
@@ -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
6 Net/samples/WebSocketServer/Makefile
View
@@ -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
4 Net/testsuite/Makefile
View
@@ -33,3 +33,7 @@ target_version = 1
target_libs = PocoNet PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lz
+endif
6 NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile
View
@@ -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
6 PageCompiler/samples/HTTPTimeServer/Makefile
View
@@ -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" $<
6 Util/samples/SampleApp/Makefile
View
@@ -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
6 Util/samples/SampleServer/Makefile
View
@@ -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
6 Util/samples/pkill/Makefile
View
@@ -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
4 Util/testsuite/Makefile
View
@@ -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
5 XML/samples/DOMParser/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoXML PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lexpat
+endif
+
5 XML/samples/PrettyPrint/Makefile
View
@@ -15,3 +15,8 @@ target_version = 1
target_libs = PocoXML PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lexpat
+endif
+
4 XML/samples/SAXParser/Makefile
View
@@ -15,3 +15,7 @@ target_version = 1
target_libs = PocoXML PocoFoundation
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lexpat
+endif
4 XML/testsuite/Makefile
View
@@ -19,3 +19,7 @@ target_version = 1
target_libs = PocoXML PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec
+
+ifdef POCO_UNBUNDLED
+ SYSLIBS += -lexpat
+endif
6 Zip/samples/unzip/Makefile
View
@@ -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
6 Zip/samples/zip/Makefile
View
@@ -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

Philip Prindeville

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.
Something went wrong with that request. Please try again.