generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-01 09:24:55 +02:00
Code Issues Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
Guenter Obiltschnig 2016-03-05 14:29:34 +01:00
parent bad56c3336
commit 15d1d0f1a2
12 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApacheConnector/dependencies
View File

@ -1,4 +1,5 @@
Net Net
Util Util
XML XML
JSON
Foundation Foundation

1
ApacheConnector/samples/dependencies
View File

@ -1,4 +1,5 @@
Net Net
Util Util
XML XML
JSON
Foundation Foundation

2
Foundation/samples/StringTokenizer/Makefile
View File

@ -12,6 +12,6 @@ objects = StringTokenizer
target = StringTokenizer target = StringTokenizer
target_version = 1 target_version = 1
target_libs = PocoJSON PocoXML PocoFoundation target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

2
Foundation/samples/URI/Makefile
View File

@ -12,6 +12,6 @@ objects = URI
target = URI target = URI
target_version = 1 target_version = 1
target_libs = PocoJSON PocoXML PocoFoundation target_libs = PocoFoundation
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

1
Net/samples/dependencies
View File

@ -1,3 +1,4 @@
Foundation Foundation
XML XML
JSON
Util Util

1
PageCompiler/File2Page/dependencies
View File

@ -1,4 +1,5 @@
Net Net
Util Util
XML XML
JSON
Foundation Foundation

1
PageCompiler/dependencies
View File

@ -1,4 +1,5 @@
Net Net
Util Util
XML XML
JSON
Foundation Foundation

4
PageCompiler/samples/dependencies Normal file
View File

@ -0,0 +1,4 @@
Foundation
Net
Util
PageCompiler

1
PocoDoc/dependencies
View File

@ -1,4 +1,5 @@
Util Util
CppParser CppParser
XML XML
JSON
Foundation Foundation

1
SevenZip/dependencies
View File

@ -1,3 +1,4 @@
Foundation Foundation
Util Util
XML XML
JSON

1
Zip/dependencies
View File

@ -2,3 +2,4 @@ Foundation
Net Net
Util Util
XML XML
JSON

32
release/script/mkrelease
View File

@ -209,17 +209,23 @@ ifndef POCO_BASE
$(warning WARNING: POCO_BASE is not defined. Assuming current directory.) $(warning WARNING: POCO_BASE is not defined. Assuming current directory.)
export POCO_BASE=$(shell pwd) export POCO_BASE=$(shell pwd)
endif endif
#$(info POCO_BASE = $(POCO_BASE)) ifdef POCO_VERBOSE
$(info POCO_BASE = $(POCO_BASE))
endif
ifndef POCO_PREFIX ifndef POCO_PREFIX
export POCO_PREFIX=/usr/local export POCO_PREFIX=/usr/local
endif endif
#$(info POCO_PREFIX=$(POCO_PREFIX)) ifdef POCO_VERBOSE
$(info POCO_PREFIX=$(POCO_PREFIX))
endif
ifndef POCO_BUILD ifndef POCO_BUILD
export POCO_BUILD=$(POCO_BASE) export POCO_BUILD=$(POCO_BASE)
endif endif
#$(info POCO_BUILD = $(POCO_BUILD)) ifdef POCO_VERBOSE
$(info POCO_BUILD = $(POCO_BUILD))
endif
# #
# Determine OS # Determine OS
@ -232,10 +238,14 @@ endif
ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW)
POCO_HOST_OSNAME = MinGW POCO_HOST_OSNAME = MinGW
endif 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 ' ' _)) 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 # 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 ifndef POCO_CONFIG
POCO_CONFIG = $(POCO_HOST_OSNAME) POCO_CONFIG = $(POCO_HOST_OSNAME)
endif endif
#$(info POCO_CONFIG = $(POCO_CONFIG)) ifdef POCO_VERBOSE
$(info POCO_CONFIG = $(POCO_CONFIG))
endif
# #
# Include System Specific Settings # Include System Specific Settings
@ -258,14 +270,18 @@ OSNAME := $(POCO_HOST_OSNAME)
else else
OSNAME := $(POCO_TARGET_OSNAME) OSNAME := $(POCO_TARGET_OSNAME)
endif endif
#$(info OSNAME = $(OSNAME)) ifdef POCO_VERBOSE
$(info OSNAME = $(OSNAME))
endif
ifndef POCO_TARGET_OSARCH ifndef POCO_TARGET_OSARCH
OSARCH := $(POCO_HOST_OSARCH) OSARCH := $(POCO_HOST_OSARCH)
else else
OSARCH := $(POCO_TARGET_OSARCH) OSARCH := $(POCO_TARGET_OSARCH)
endif endif
#$(info OSARCH = $(OSARCH)) ifdef POCO_VERBOSE
$(info OSARCH = $(OSARCH))
endif
.PHONY: poco all libexecs cppunit tests samples cleans clean distclean install .PHONY: poco all libexecs cppunit tests samples cleans clean distclean install