diff --git a/ApacheConnector/dependencies b/ApacheConnector/dependencies index afd736493..ac367b3f1 100644 --- a/ApacheConnector/dependencies +++ b/ApacheConnector/dependencies @@ -1,4 +1,5 @@ Net Util XML +JSON Foundation diff --git a/ApacheConnector/samples/dependencies b/ApacheConnector/samples/dependencies index afd736493..ac367b3f1 100644 --- a/ApacheConnector/samples/dependencies +++ b/ApacheConnector/samples/dependencies @@ -1,4 +1,5 @@ Net Util XML +JSON Foundation diff --git a/Foundation/samples/StringTokenizer/Makefile b/Foundation/samples/StringTokenizer/Makefile index 8c150b38e..2114063ea 100644 --- a/Foundation/samples/StringTokenizer/Makefile +++ b/Foundation/samples/StringTokenizer/Makefile @@ -12,6 +12,6 @@ objects = StringTokenizer target = StringTokenizer target_version = 1 -target_libs = PocoJSON PocoXML PocoFoundation +target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/Foundation/samples/URI/Makefile b/Foundation/samples/URI/Makefile index 761a7c906..17ffb8f0a 100644 --- a/Foundation/samples/URI/Makefile +++ b/Foundation/samples/URI/Makefile @@ -12,6 +12,6 @@ objects = URI target = URI target_version = 1 -target_libs = PocoJSON PocoXML PocoFoundation +target_libs = PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/Net/samples/dependencies b/Net/samples/dependencies index 9abb396e6..b8694eecd 100644 --- a/Net/samples/dependencies +++ b/Net/samples/dependencies @@ -1,3 +1,4 @@ Foundation XML +JSON Util diff --git a/PageCompiler/File2Page/dependencies b/PageCompiler/File2Page/dependencies index afd736493..ac367b3f1 100644 --- a/PageCompiler/File2Page/dependencies +++ b/PageCompiler/File2Page/dependencies @@ -1,4 +1,5 @@ Net Util XML +JSON Foundation diff --git a/PageCompiler/dependencies b/PageCompiler/dependencies index afd736493..ac367b3f1 100644 --- a/PageCompiler/dependencies +++ b/PageCompiler/dependencies @@ -1,4 +1,5 @@ Net Util XML +JSON Foundation diff --git a/PageCompiler/samples/dependencies b/PageCompiler/samples/dependencies new file mode 100644 index 000000000..44c14efc7 --- /dev/null +++ b/PageCompiler/samples/dependencies @@ -0,0 +1,4 @@ +Foundation +Net +Util +PageCompiler diff --git a/PocoDoc/dependencies b/PocoDoc/dependencies index faca17665..31fd98e1b 100644 --- a/PocoDoc/dependencies +++ b/PocoDoc/dependencies @@ -1,4 +1,5 @@ Util CppParser XML +JSON Foundation diff --git a/SevenZip/dependencies b/SevenZip/dependencies index c694b3733..a4b61d5e9 100644 --- a/SevenZip/dependencies +++ b/SevenZip/dependencies @@ -1,3 +1,4 @@ Foundation Util XML +JSON \ No newline at end of file diff --git a/Zip/dependencies b/Zip/dependencies index 5242bc4e0..eb3196294 100644 --- a/Zip/dependencies +++ b/Zip/dependencies @@ -2,3 +2,4 @@ Foundation Net Util XML +JSON \ No newline at end of file diff --git a/release/script/mkrelease b/release/script/mkrelease index e5b4e269a..232f9f9dc 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -209,17 +209,23 @@ ifndef POCO_BASE $(warning WARNING: POCO_BASE is not defined. Assuming current directory.) export POCO_BASE=$(shell pwd) endif -#$(info POCO_BASE = $(POCO_BASE)) +ifdef POCO_VERBOSE +$(info POCO_BASE = $(POCO_BASE)) +endif ifndef POCO_PREFIX export POCO_PREFIX=/usr/local endif -#$(info POCO_PREFIX=$(POCO_PREFIX)) +ifdef POCO_VERBOSE +$(info POCO_PREFIX=$(POCO_PREFIX)) +endif ifndef POCO_BUILD export POCO_BUILD=$(POCO_BASE) endif -#$(info POCO_BUILD = $(POCO_BUILD)) +ifdef POCO_VERBOSE +$(info POCO_BUILD = $(POCO_BUILD)) +endif # # Determine OS @@ -232,10 +238,14 @@ endif ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) POCO_HOST_OSNAME = MinGW endif -#$(info POCO_HOST_OSNAME= $(POCO_HOST_OSNAME)) +ifdef POCO_VERBOSE +$(info POCO_HOST_OSNAME= $(POCO_HOST_OSNAME)) +endif POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) -#$(info POCO_HOST_OSARCH= $(POCO_HOST_OSARCH)) +ifdef POCO_VERBOSE +$(info POCO_HOST_OSARCH= $(POCO_HOST_OSARCH)) +endif # # If POCO_CONFIG is not set, use the OS name as configuration name @@ -243,7 +253,9 @@ POCO_HOST_OSARCH ?= $(subst /,-,$(shell uname -m | tr ' ' _)) ifndef POCO_CONFIG POCO_CONFIG = $(POCO_HOST_OSNAME) endif -#$(info POCO_CONFIG = $(POCO_CONFIG)) +ifdef POCO_VERBOSE +$(info POCO_CONFIG = $(POCO_CONFIG)) +endif # # Include System Specific Settings @@ -258,14 +270,18 @@ OSNAME := $(POCO_HOST_OSNAME) else OSNAME := $(POCO_TARGET_OSNAME) endif -#$(info OSNAME = $(OSNAME)) +ifdef POCO_VERBOSE +$(info OSNAME = $(OSNAME)) +endif ifndef POCO_TARGET_OSARCH OSARCH := $(POCO_HOST_OSARCH) else OSARCH := $(POCO_TARGET_OSARCH) endif -#$(info OSARCH = $(OSARCH)) +ifdef POCO_VERBOSE +$(info OSARCH = $(OSARCH)) +endif .PHONY: poco all libexecs cppunit tests samples cleans clean distclean install