diff options
| author | Joe George <joe@zeroc.com> | 2017-05-03 15:20:31 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-05-03 15:21:01 -0400 |
| commit | 24b977b2d97931e55629571cddc754b8efa7ef05 (patch) | |
| tree | 82371f392e08cc0d5e0bea610bd70419ce0408ba /cpp | |
| parent | Remove unnecessary tabs (diff) | |
| download | ice-24b977b2d97931e55629571cddc754b8efa7ef05.tar.bz2 ice-24b977b2d97931e55629571cddc754b8efa7ef05.tar.xz ice-24b977b2d97931e55629571cddc754b8efa7ef05.zip | |
Fix tabs and spaces in Makefiles
Diffstat (limited to 'cpp')
56 files changed, 462 insertions, 462 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 76e78976467..4dc4a22610f 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index ae89a9a6622..6e9a1ce9b20 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -16,35 +16,35 @@ # supported-configs = shared static cpp11-shared cpp11-static --include $(lang_srcdir)/config/Make.rules.$(os) +-include $(lang_srcdir)/config/Make.rules.$(os) ifeq ($(os),Darwin) -include $(lang_srcdir)/config/Make.xcodesdk.rules +include $(lang_srcdir)/config/Make.xcodesdk.rules endif # # Define which projects to build for the different configurations. # -coreandstub_components = IceUtil \ - Ice \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery \ - Glacier2 \ - IceStorm \ - IceGrid \ - IceBox \ - IcePatch2 +coreandstub_components = IceUtil \ + Ice \ + IceSSL \ + IceDiscovery \ + IceLocatorDiscovery \ + Glacier2 \ + IceStorm \ + IceGrid \ + IceBox \ + IcePatch2 # Add the Bluetooth transport for Debian/Ubuntu/Yocto ifneq ($(filter debian ubuntu yocto,$(linux_id)),) -coreandstub_components += IceXML IceBT +coreandstub_components += IceXML IceBT endif # # Build all the projects with the shared configuration, except IceUtil and Slice # that are static-only # -shared_projects = % +shared_projects = % shared_excludes = IceUtil Slice # @@ -57,18 +57,18 @@ static_excludes = test/Ice/library test/Ice/plugin # # Components and projects which are built with C++11 # -cpp11_components = $(coreandstub_components) icebox +cpp11_components = $(coreandstub_components) icebox -cpp11_projects = test/Common \ - test/IceUtil/% \ - test/Slice/% \ - test/Ice/% \ - test/IceSSL/% \ - test/IceDiscovery/% \ - test/IceBox/% +cpp11_projects = test/Common \ + test/IceUtil/% \ + test/Slice/% \ + test/Ice/% \ + test/IceSSL/% \ + test/IceDiscovery/% \ + test/IceBox/% -cpp11_excludes = IcePatch2 \ - test/Ice/gc +cpp11_excludes = IcePatch2 \ + test/Ice/gc # # If building on a Linux multilib platform, we restrict what we build for @@ -76,8 +76,8 @@ cpp11_excludes = IcePatch2 \ # as C++11 (libraries and icebox executable). # ifeq ($(multilib-platform),yes) -x86_components = $(coreandstub_components) IceDB IceStormService icebox -x86_projects = test/% +x86_components = $(coreandstub_components) IceDB IceStormService icebox +x86_projects = test/% endif # @@ -90,18 +90,18 @@ endif # the cpp11 name to the target directory if building outside the build # directory. # -cpp11_cppflags = -DICE_CPP11_MAPPING -std=c++11 -cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) -cpp11_targetdir = $(if $(filter %/build,$5),cpp11) +cpp11_cppflags = -DICE_CPP11_MAPPING -std=c++11 +cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) +cpp11_targetdir = $(if $(filter %/build,$5),cpp11) # # $(call make-cpp-src-project,$1=project) # define make-cpp-src-project ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(slicedir) -$1_cppflags += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(slicedir) +$1_cppflags += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC $(make-project) srcs:: $1 endif @@ -111,11 +111,11 @@ endef # $(call make-cpp-test-project,$1=project) # define make-cpp-test-project -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(slicedir) -$1_cppflags += -I$1/generated -I$1 -Itest/include -I$(includedir) +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(slicedir) +$1_cppflags += -I$1/generated -I$1 -Itest/include -I$(includedir) ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) -$1_cppflags += -I$(includedir)/generated +$1_cppflags += -I$(includedir)/generated endif $(make-project) tests:: $1 @@ -125,18 +125,18 @@ endef # $(create-cpp-test-project $1=test) # define create-cpp-test-project -$1_srcext := cpp -$1_dependencies := $$(or $$($1_dependencies),TestCommon Ice) +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),TestCommon Ice) # Also link with IceSSL and IceBT (Debian/Ubuntu/Yocto) when compiling the project with the static configuration -$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto,$(linux_id)),IceBT) +$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto,$(linux_id)),IceBT) # Dependencies and target dirs for Xcode SDK test projects -$1[xcodesdk]_dependencies := IceSSL -$1[iphoneos-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphoneos/$(subst /,_,$1) -$1[iphonesimulator-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphonesimulator/$(subst /,_,$1) -$1[iphoneos-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphoneos/$(subst /,_,$1) -$1[iphonesimulator-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphonesimulator/$(subst /,_,$1) +$1[xcodesdk]_dependencies := IceSSL +$1[iphoneos-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphoneos/$(subst /,_,$1) +$1[iphonesimulator-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphonesimulator/$(subst /,_,$1) +$1[iphoneos-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphoneos/$(subst /,_,$1) +$1[iphonesimulator-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphonesimulator/$(subst /,_,$1) $(create-test-project) endef diff --git a/cpp/config/Make.rules.MINGW b/cpp/config/Make.rules.MINGW index b0a0997d823..cf3e3d901ce 100644 --- a/cpp/config/Make.rules.MINGW +++ b/cpp/config/Make.rules.MINGW @@ -22,8 +22,8 @@ CXX = c++ # 0x602 = Windows 8 / Windows Server 2012 ICE_WIN32_WINNT := 0x601 -CXXFLAGS = $(CXXARCHFLAGS) -mthreads -Wall -Werror -D_WIN32_WINNT=$(ICE_WIN32_WINNT) -DWIN32_LEAN_AND_MEAN -LDFLAGS = -Wl,-no-undefined +CXXFLAGS = $(CXXARCHFLAGS) -mthreads -Wall -Werror -D_WIN32_WINNT=$(ICE_WIN32_WINNT) -DWIN32_LEAN_AND_MEAN +LDFLAGS = -Wl,-no-undefined ifeq ($(STATICLIBS),yes) CXXFLAGS += -DICE_STATIC_LIBS @@ -36,9 +36,9 @@ else CXXFLAGS += -g -D_DEBUG endif -COMPSUFFIX = _mingw +COMPSUFFIX = _mingw -mklibfilename = $(shell echo $(1) | tr A-Z a-z)$(SOVERSION)$(COMPSUFFIX).dll +mklibfilename = $(shell echo $(1) | tr A-Z a-z)$(SOVERSION)$(COMPSUFFIX).dll ifeq ($(STATICLIBS),yes) mklibtargets = $(3) @@ -46,15 +46,15 @@ else mklibtargets = $(1) endif -mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) \ - $(subst cpp/lib,cpp/bin, \ - $(subst -lIce,-lice$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceUtil,-liceutil$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lSlice,-lslice$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceSSL,-licessl$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceDiscovery,-licediscovery$(SOVERSION)$(COMPSUFFIX),$(4))))))) +mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) \ + $(subst cpp/lib,cpp/bin, \ + $(subst -lIce,-lice$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceUtil,-liceutil$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lSlice,-lslice$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceSSL,-licessl$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceDiscovery,-licediscovery$(SOVERSION)$(COMPSUFFIX),$(4))))))) -mklib = ar cr $(1) $(2) +mklib = ar cr $(1) $(2) ifeq ($(LP64),yes) @@ -66,26 +66,26 @@ else endif ifneq ($(LP64),yes) -PLATFORM = Win32 +PLATFORM = Win32 else -PLATFORM = x64 +PLATFORM = x64 endif -PLATFORMTOOLSET = mingw4.7.2 -PKG_DIR = $(top_srcdir)/third-party-packages +PLATFORMTOOLSET = mingw4.7.2 +PKG_DIR = $(top_srcdir)/third-party-packages -BZIP2_VERSION = 1.0.6.1 -BZIP2_HOME = $(PKG_DIR)/bzip2.$(PLATFORMTOOLSET) -BZIP2_FLAGS = -I$(BZIP2_HOME)/build/native/include -BZIP2_LIBS = -L$(BZIP2_HOME)/build/native/bin/$(PLATFORM) -lbzip2$(COMPSUFFIX) -BZIP2_NUPKG = $(BZIP2_HOME)/bzip2.$(PLATFORMTOOLSET).nupkg +BZIP2_VERSION = 1.0.6.1 +BZIP2_HOME = $(PKG_DIR)/bzip2.$(PLATFORMTOOLSET) +BZIP2_FLAGS = -I$(BZIP2_HOME)/build/native/include +BZIP2_LIBS = -L$(BZIP2_HOME)/build/native/bin/$(PLATFORM) -lbzip2$(COMPSUFFIX) +BZIP2_NUPKG = $(BZIP2_HOME)/bzip2.$(PLATFORMTOOLSET).nupkg -MCPP_VERSION = 2.7.2.8 -MCPP_HOME = $(PKG_DIR)/mcpp.$(PLATFORMTOOLSET) -MCPP_LIBS = -L$(MCPP_HOME)/build/native/lib/$(PLATFORM) -lmcpp -MCPP_NUPKG = $(MCPP_HOME)/mcpp.$(PLATFORMTOOLSET).nupkg +MCPP_VERSION = 2.7.2.8 +MCPP_HOME = $(PKG_DIR)/mcpp.$(PLATFORMTOOLSET) +MCPP_LIBS = -L$(MCPP_HOME)/build/native/lib/$(PLATFORM) -lmcpp +MCPP_NUPKG = $(MCPP_HOME)/mcpp.$(PLATFORMTOOLSET).nupkg -NUGET = $(subst \,/,$(LOCALAPPDATA)/ZeroC/nuget/nuget.exe) +NUGET = $(subst \,/,$(LOCALAPPDATA)/ZeroC/nuget/nuget.exe) $(NUGET): @mkdir -p "$(LOCALAPPDATA)\ZeroC\nuget" @@ -101,29 +101,29 @@ $(MCPP_NUPKG): $(NUGET) @rm -rf "$(PKG_DIR)\mcpp.$(PLATFORMTOOLSET)" $(NUGET) install mcpp.$(PLATFORMTOOLSET) -OutputDirectory "$(PKG_DIR)" -ExcludeVersion -libdir := $(top_srcdir)/$(libsubdir) -bindir := $(top_srcdir)/$(binsubdir) +libdir := $(top_srcdir)/$(libsubdir) +bindir := $(top_srcdir)/$(binsubdir) -installlib = $(INSTALL) $(2)/$(3) $(1); \ - chmod a+rx $(1)/$(3) +installlib = $(INSTALL) $(2)/$(3) $(1); \ + chmod a+rx $(1)/$(3) -installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ - chmod a+rx $(2)/$(notdir $(1)) +installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ + chmod a+rx $(2)/$(notdir $(1)) -SSL_OS_LIBS = -lsecur32 -lcrypt32 -lws2_32 +SSL_OS_LIBS = -lsecur32 -lcrypt32 -lws2_32 ifeq ($(STATICLIBS),yes) -BASELIBS = -liceutil $(ICEUTIL_OS_LIBS) -LIBS = -lice $(BASELIBS) +BASELIBS = -liceutil $(ICEUTIL_OS_LIBS) +LIBS = -lice $(BASELIBS) ICESSL_LIBS = -licessl -SLICE_LIBS = -lslice $(BASELIBS) +SLICE_LIBS = -lslice $(BASELIBS) else -BASELIBS = -liceutil$(SOVERSION)$(COMPSUFFIX) $(ICEUTIL_OS_LIBS) -LIBS = -lice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) +BASELIBS = -liceutil$(SOVERSION)$(COMPSUFFIX) $(ICEUTIL_OS_LIBS) +LIBS = -lice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) ICESSL_LIBS = -licessl$(SOVERSION)$(COMPSUFFIX) -SLICE_LIBS = -lslice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) +SLICE_LIBS = -lslice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) endif -ICEUTIL_OS_LIBS = -lrpcrt4 -ladvapi32 -lshlwapi -ICE_OS_LIBS = $(ICEUTIL_OS_LIBS) -lIphlpapi -lws2_32 +ICEUTIL_OS_LIBS = -lrpcrt4 -ladvapi32 -lshlwapi +ICE_OS_LIBS = $(ICEUTIL_OS_LIBS) -lIphlpapi -lws2_32 EXE_EXT = .exe diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules index 2cf7476e945..ab9bb6ae1fa 100644 --- a/cpp/config/Make.xcodesdk.rules +++ b/cpp/config/Make.xcodesdk.rules @@ -9,26 +9,26 @@ include $(top_srcdir)/config/Make.xcodesdk.rules -supported-configs += xcodesdk cpp11-xcodesdk +supported-configs += xcodesdk cpp11-xcodesdk -is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_target))) +is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_target))) # # Xcode configuration to build Xcode IceSDK. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) -xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) -xcodesdk_targetrule = $(if $(is-iostest-program),iostest,$(if $(filter-out program,$($1_target)),static)) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) +xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) +xcodesdk_targetrule = $(if $(is-iostest-program),iostest,$(if $(filter-out program,$($1_target)),static)) -xcodesdk_components = Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP TestCommon -xcodesdk_projects = test/Ice/% test/IceSSL/configuration -xcodesdk_excludes = $(addprefix test/Ice/,background \ - faultTolerance \ - gc \ - logger \ - properties \ - stringConverter \ - threadPoolPriority) +xcodesdk_components = Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP TestCommon +xcodesdk_projects = test/Ice/% test/IceSSL/configuration +xcodesdk_excludes = $(addprefix test/Ice/,background \ + faultTolerance \ + gc \ + logger \ + properties \ + stringConverter \ + threadPoolPriority) # # Rule to build an iOS bundle for testing (this is used for packaging client/server programs) @@ -63,9 +63,9 @@ $(make-xcodesdk-component-with-config) ifneq ($$(and $(filter iphone%,$3),$(filter Ice,$2),$$(filter-out $$($2_sdk_includedirs),$3-IceUtil)),) $2_sdk_includedirs += $3-IceUtil $$(eval $$(call install-data-files,$$(wildcard include/IceUtil/*.h),include,\ - $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) + $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) $$(eval $$(call install-data-files,$$(wildcard include/IceUtil/*.h),include,\ - $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) + $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) endif $5_clean:: diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile index b44afb207b4..74a6dc83aba 100644 --- a/cpp/include/IceBT/Makefile +++ b/cpp/include/IceBT/Makefile @@ -7,7 +7,7 @@ # # ********************************************************************** -top_srcdir = ../.. +top_srcdir = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk index 5e5fd221095..bb38b967be6 100644 --- a/cpp/src/Glacier2/Makefile.mk +++ b/cpp/src/Glacier2/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_programs := glacier2router -$(project)_sliceflags := --include-dir Glacier2 +$(project)_programs := glacier2router +$(project)_sliceflags := --include-dir Glacier2 $(project)_generated_includedir := $(project)/generated/Glacier2 -$(project)_dependencies := Glacier2 IceSSL Ice +$(project)_dependencies := Glacier2 IceSSL Ice -glacier2router_targetdir := $(bindir) +glacier2router_targetdir := $(bindir) projects += $(project) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk index cc150ee2908..7ebcc9f9ee6 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries += Glacier2CryptPermissionsVerifier +$(project)_libraries += Glacier2CryptPermissionsVerifier -Glacier2CryptPermissionsVerifier_targetdir := $(libdir) -Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice -Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS +Glacier2CryptPermissionsVerifier_targetdir := $(libdir) +Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice +Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS projects += $(project) diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk index ee38a48eba5..db1746bec29 100644 --- a/cpp/src/Glacier2Lib/Makefile.mk +++ b/cpp/src/Glacier2Lib/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_libraries := Glacier2 +$(project)_libraries := Glacier2 -Glacier2_targetdir := $(libdir) -Glacier2_dependencies := Ice -Glacier2_cppflags := -DGLACIER2_API_EXPORTS -Glacier2_sliceflags := --include-dir Glacier2 +Glacier2_targetdir := $(libdir) +Glacier2_dependencies := Ice +Glacier2_cppflags := -DGLACIER2_API_EXPORTS +Glacier2_sliceflags := --include-dir Glacier2 projects += $(project) diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk index b8f613fc1f3..d7f807a9f99 100644 --- a/cpp/src/Ice/Makefile.mk +++ b/cpp/src/Ice/Makefile.mk @@ -7,28 +7,28 @@ # # ********************************************************************** -$(project)_libraries = Ice +$(project)_libraries = Ice -Ice_targetdir := $(libdir) -Ice_cppflags = -DICE_API_EXPORTS $(IceUtil_cppflags) +Ice_targetdir := $(libdir) +Ice_cppflags = -DICE_API_EXPORTS $(IceUtil_cppflags) Ice_ldflags = $(iconv_ldflags) ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) Ice_cppflags += -DICE_PRIO_INHERIT endif -Ice_sliceflags := --include-dir Ice -Ice_libs := bz2 +Ice_sliceflags := --include-dir Ice +Ice_libs := bz2 Ice_extra_sources := $(wildcard src/IceUtil/*.cpp) -Ice_excludes = src/Ice/DLLMain.cpp +Ice_excludes = src/Ice/DLLMain.cpp ifeq ($(os),Darwin) Ice_excludes += src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp endif -Ice[iphoneos]_excludes := $(wildcard $(addprefix $(currentdir)/,Tcp*.cpp)) -Ice[iphoneos]_extra_sources := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm)) -Ice[iphonesimulator]_excludes = $(Ice[iphoneos]_excludes) -Ice[iphonesimulator]_extra_sources = $(Ice[iphoneos]_extra_sources) +Ice[iphoneos]_excludes := $(wildcard $(addprefix $(currentdir)/,Tcp*.cpp)) +Ice[iphoneos]_extra_sources := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm)) +Ice[iphonesimulator]_excludes = $(Ice[iphoneos]_excludes) +Ice[iphonesimulator]_extra_sources = $(Ice[iphoneos]_extra_sources) projects += $(project) diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index 8934def4122..f20f5ab5b15 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -9,13 +9,13 @@ ifneq ($(filter debian ubuntu yocto,$(linux_id)),) -$(project)_libraries := IceBT +$(project)_libraries := IceBT -IceBT_targetdir := $(libdir) -IceBT_dependencies := Ice -IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) -IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) -IceBT_sliceflags := --include-dir IceBT +IceBT_targetdir := $(libdir) +IceBT_dependencies := Ice +IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) +IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) +IceBT_sliceflags := --include-dir IceBT projects += $(project) diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk index 7f9db662ad1..3afa222f7d7 100644 --- a/cpp/src/IceBox/Makefile.mk +++ b/cpp/src/IceBox/Makefile.mk @@ -7,20 +7,20 @@ # # ********************************************************************** -$(project)_libraries := IceBox -$(project)_programs := icebox iceboxadmin -$(project)_dependencies := Ice -$(project)_sliceflags := --include-dir IceBox +$(project)_libraries := IceBox +$(project)_programs := icebox iceboxadmin +$(project)_dependencies := Ice +$(project)_sliceflags := --include-dir IceBox -IceBox_targetdir := $(libdir) -IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp +IceBox_targetdir := $(libdir) +IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp -icebox_targetdir := $(bindir) -icebox_sources := $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp -icebox_dependencies := IceBox +icebox_targetdir := $(bindir) +icebox_sources := $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp +icebox_dependencies := IceBox -iceboxadmin_targetdir := $(bindir) -iceboxadmin_sources := $(currentdir)/Admin.cpp +iceboxadmin_targetdir := $(bindir) +iceboxadmin_sources := $(currentdir)/Admin.cpp iceboxadmin_dependencies:= IceBox projects += $(project) diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk index 832b16729c5..0a1a472636e 100644 --- a/cpp/src/IceBridge/Makefile.mk +++ b/cpp/src/IceBridge/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(project)_programs := icebridge -$(project)_dependencies := Ice +$(project)_programs := icebridge +$(project)_dependencies := Ice -icebridge_targetdir := $(bindir) +icebridge_targetdir := $(bindir) projects += $(project) diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk index b3f4a2893a1..fa8e18825ed 100644 --- a/cpp/src/IceDB/Makefile.mk +++ b/cpp/src/IceDB/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_libraries = IceDB +$(project)_libraries = IceDB -IceDB_targetdir := $(libdir) -IceDB_dependencies := Ice -IceDB_libs := lmdb -IceDB_cppflags := -DICE_DB_API_EXPORTS +IceDB_targetdir := $(libdir) +IceDB_dependencies := Ice +IceDB_libs := lmdb +IceDB_cppflags := -DICE_DB_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk index 00ebbb0712d..e7aa1a41ba1 100644 --- a/cpp/src/IceDiscovery/Makefile.mk +++ b/cpp/src/IceDiscovery/Makefile.mk @@ -9,10 +9,10 @@ $(project)_libraries := IceDiscovery -IceDiscovery_targetdir := $(libdir) -IceDiscovery_dependencies := Ice -IceDiscovery_sliceflags := --include-dir IceDiscovery -IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery -IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS +IceDiscovery_targetdir := $(libdir) +IceDiscovery_dependencies := Ice +IceDiscovery_sliceflags := --include-dir IceDiscovery +IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery +IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index f3758a17fe3..bd7f8c02362 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -7,80 +7,80 @@ # # ********************************************************************** -local_node_srcs = Activator.cpp \ - NodeAdminRouter.cpp \ - NodeI.cpp \ - NodeSessionManager.cpp \ - ServerAdapterI.cpp \ - ServerI.cpp +local_node_srcs = Activator.cpp \ + NodeAdminRouter.cpp \ + NodeI.cpp \ + NodeSessionManager.cpp \ + ServerAdapterI.cpp \ + ServerI.cpp -local_registry_srcs = Internal.ice \ - AdminRouter.cpp \ - DescriptorBuilder.cpp \ - DescriptorParser.cpp \ - FileCache.cpp \ - PlatformInfo.cpp \ - SessionManager.cpp \ - TraceLevels.cpp \ - AdminCallbackRouter.cpp \ - AdapterCache.cpp \ - AdminI.cpp \ - AdminSessionI.cpp \ - Allocatable.cpp \ - AllocatableObjectCache.cpp \ - Database.cpp \ - DescriptorHelper.cpp \ - FileUserAccountMapperI.cpp \ - InternalRegistryI.cpp \ - LocatorI.cpp \ - LocatorRegistryI.cpp \ - NodeCache.cpp \ - NodeSessionI.cpp \ - ObjectCache.cpp \ - PluginFacadeI.cpp \ - QueryI.cpp \ - ReapThread.cpp \ - RegistryAdminRouter.cpp \ - RegistryI.cpp \ - ReplicaCache.cpp \ - ReplicaSessionI.cpp \ - ReplicaSessionManager.cpp \ - ServerCache.cpp \ - SessionI.cpp \ - SessionServantManager.cpp \ - Topics.cpp \ - Util.cpp \ - WellKnownObjectsManager.cpp +local_registry_srcs = Internal.ice \ + AdminRouter.cpp \ + DescriptorBuilder.cpp \ + DescriptorParser.cpp \ + FileCache.cpp \ + PlatformInfo.cpp \ + SessionManager.cpp \ + TraceLevels.cpp \ + AdminCallbackRouter.cpp \ + AdapterCache.cpp \ + AdminI.cpp \ + AdminSessionI.cpp \ + Allocatable.cpp \ + AllocatableObjectCache.cpp \ + Database.cpp \ + DescriptorHelper.cpp \ + FileUserAccountMapperI.cpp \ + InternalRegistryI.cpp \ + LocatorI.cpp \ + LocatorRegistryI.cpp \ + NodeCache.cpp \ + NodeSessionI.cpp \ + ObjectCache.cpp \ + PluginFacadeI.cpp \ + QueryI.cpp \ + ReapThread.cpp \ + RegistryAdminRouter.cpp \ + RegistryI.cpp \ + ReplicaCache.cpp \ + ReplicaSessionI.cpp \ + ReplicaSessionManager.cpp \ + ServerCache.cpp \ + SessionI.cpp \ + SessionServantManager.cpp \ + Topics.cpp \ + Util.cpp \ + WellKnownObjectsManager.cpp -local_admin_srcs = Internal.ice \ - Client.cpp \ - DescriptorBuilder.cpp \ - DescriptorHelper.cpp \ - DescriptorParser.cpp \ - FileParserI.cpp \ - Grammar.cpp \ - Parser.cpp \ - Scanner.cpp \ - Util.cpp +local_admin_srcs = Internal.ice \ + Client.cpp \ + DescriptorBuilder.cpp \ + DescriptorHelper.cpp \ + DescriptorParser.cpp \ + FileParserI.cpp \ + Grammar.cpp \ + Parser.cpp \ + Scanner.cpp \ + Util.cpp -$(project)_programs = icegridnode icegridregistry icegridadmin -$(project)_sliceflags := -Isrc --include-dir IceGrid +$(project)_programs = icegridnode icegridregistry icegridadmin +$(project)_sliceflags := -Isrc --include-dir IceGrid $(project)_generated_includedir := $(project)/generated/IceGrid -$(project)_dependencies := IceGrid Glacier2 Ice -$(project)_targetdir := $(bindir) +$(project)_dependencies := IceGrid Glacier2 Ice +$(project)_targetdir := $(bindir) -icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) \ +icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) \ $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice -icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB -icegridnode_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB +icegridnode_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) \ - $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice -icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) -icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) \ + $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice +icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) +icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery -icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) +icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery +icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) projects += $(project) diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk index 8386ff8c42a..785cd1236a6 100644 --- a/cpp/src/IceGridLib/Makefile.mk +++ b/cpp/src/IceGridLib/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries := IceGrid +$(project)_libraries := IceGrid -IceGrid_targetdir := $(libdir) -IceGrid_dependencies := Glacier2 Ice -IceGrid_sliceflags := --include-dir IceGrid +IceGrid_targetdir := $(libdir) +IceGrid_dependencies := Glacier2 Ice +IceGrid_sliceflags := --include-dir IceGrid projects += $(project) diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk index 8aa2164c111..4f89ecb8eb5 100644 --- a/cpp/src/IceIAP/Makefile.mk +++ b/cpp/src/IceIAP/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_libraries = IceIAP +$(project)_libraries = IceIAP -IceIAP_configs := xcodesdk cpp11-xcodesdk -IceIAP_platforms := iphoneos iphonesimulator +IceIAP_configs := xcodesdk cpp11-xcodesdk +IceIAP_platforms := iphoneos iphonesimulator -IceIAP_targetdir := $(libdir) -IceIAP_dependencies := Ice -IceIAP_sliceflags := --include-dir IceIAP -IceIAP_cppflags := -DICEIAP_API_EXPORTS +IceIAP_targetdir := $(libdir) +IceIAP_dependencies := Ice +IceIAP_sliceflags := --include-dir IceIAP +IceIAP_cppflags := -DICEIAP_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk index 4b708bb58dd..139d27fb599 100644 --- a/cpp/src/IceLocatorDiscovery/Makefile.mk +++ b/cpp/src/IceLocatorDiscovery/Makefile.mk @@ -9,10 +9,10 @@ $(project)_libraries := IceLocatorDiscovery -IceLocatorDiscovery_targetdir := $(libdir) -IceLocatorDiscovery_dependencies := Ice -IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery -IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery -IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS +IceLocatorDiscovery_targetdir := $(libdir) +IceLocatorDiscovery_dependencies := Ice +IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery +IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery +IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS projects += $(project) diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk index bb37148a8aa..fe07e5b25d8 100644 --- a/cpp/src/IcePatch2/Makefile.mk +++ b/cpp/src/IcePatch2/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_programs := icepatch2server icepatch2client icepatch2calc -$(project)_dependencies := IcePatch2 Ice -$(project)_targetdir := $(bindir) +$(project)_programs := icepatch2server icepatch2client icepatch2calc +$(project)_dependencies := IcePatch2 Ice +$(project)_targetdir := $(bindir) -icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) -icepatch2client_sources := $(addprefix $(currentdir)/,Client.cpp) -icepatch2calc_sources := $(addprefix $(currentdir)/,Calc.cpp) +icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) +icepatch2client_sources := $(addprefix $(currentdir)/,Client.cpp) +icepatch2calc_sources := $(addprefix $(currentdir)/,Calc.cpp) projects += $(project) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk index 3944f6b026c..20e9c5ab05e 100644 --- a/cpp/src/IcePatch2Lib/Makefile.mk +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_libraries := IcePatch2 +$(project)_libraries := IcePatch2 -IcePatch2_targetdir := $(libdir) -IcePatch2_dependencies := Ice -IcePatch2_libs := bz2 -IcePatch2_sliceflags := --include-dir IcePatch2 -IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) +IcePatch2_targetdir := $(libdir) +IcePatch2_dependencies := Ice +IcePatch2_libs := bz2 +IcePatch2_sliceflags := --include-dir IcePatch2 +IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) projects += $(project) diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk index da98ab6c2b3..9be9b79ead3 100644 --- a/cpp/src/IceSSL/Makefile.mk +++ b/cpp/src/IceSSL/Makefile.mk @@ -7,25 +7,25 @@ # # ********************************************************************** -$(project)_libraries := IceSSL +$(project)_libraries := IceSSL -IceSSL_targetdir := $(libdir) -IceSSL_dependencies := Ice -IceSSL_cppflags := -DICESSL_API_EXPORTS -IceSSL_sliceflags := --include-dir IceSSL +IceSSL_targetdir := $(libdir) +IceSSL_dependencies := Ice +IceSSL_cppflags := -DICESSL_API_EXPORTS +IceSSL_sliceflags := --include-dir IceSSL # # Exclude sources that are not build with the default # implementation. # -IceSSL_excludes += $(wildcard src/IceSSL/SChannel*.cpp) -IceSSL_excludes += $(wildcard src/IceSSL/UWP*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/SChannel*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/UWP*.cpp) ifeq ($(os),Darwin) -IceSSL_excludes += $(wildcard src/IceSSL/OpenSSL*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/OpenSSL*.cpp) else -IceSSL_cppflags += -DICESSL_OPENSSL_API_EXPORTS -IceSSL_excludes += $(wildcard src/IceSSL/SecureTransport*.cpp) +IceSSL_cppflags += -DICESSL_OPENSSL_API_EXPORTS +IceSSL_excludes += $(wildcard src/IceSSL/SecureTransport*.cpp) endif projects += $(project) diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk index db136b5b8ec..34ac74a7015 100644 --- a/cpp/src/IceStorm/Makefile.mk +++ b/cpp/src/IceStorm/Makefile.mk @@ -7,48 +7,48 @@ # # ********************************************************************** -$(project)_libraries := IceStormService -$(project)_programs := icestormadmin icestormdb -$(project)_sliceflags := -Isrc --include-dir IceStorm +$(project)_libraries := IceStormService +$(project)_programs := icestormadmin icestormdb +$(project)_sliceflags := -Isrc --include-dir IceStorm $(project)_generated_includedir := $(project)/generated/IceStorm -$(project)_dependencies := IceStorm Ice +$(project)_dependencies := IceStorm Ice -IceStormService_targetdir := $(libdir) -IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB -IceStormService_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ - InstrumentationI.cpp \ - NodeI.cpp \ - Observers.cpp \ - Service.cpp \ - Subscriber.cpp \ - TopicI.cpp \ - TopicManagerI.cpp \ - TraceLevels.cpp \ - TransientTopicI.cpp \ - TransientTopicManagerI.cpp \ - Util.cpp \ - Election.ice \ - IceStormInternal.ice \ - Instrumentation.ice \ - LinkRecord.ice \ - LLURecord.ice \ - SubscriberRecord.ice \ - DBTypes.ice) +IceStormService_targetdir := $(libdir) +IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB +IceStormService_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ + InstrumentationI.cpp \ + NodeI.cpp \ + Observers.cpp \ + Service.cpp \ + Subscriber.cpp \ + TopicI.cpp \ + TopicManagerI.cpp \ + TraceLevels.cpp \ + TransientTopicI.cpp \ + TransientTopicManagerI.cpp \ + Util.cpp \ + Election.ice \ + IceStormInternal.ice \ + Instrumentation.ice \ + LinkRecord.ice \ + LLURecord.ice \ + SubscriberRecord.ice \ + DBTypes.ice) -icestormadmin_targetdir := $(bindir) -icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ - Grammar.y \ - Parser.cpp \ - Scanner.l \ - LLURecord.ice \ - SubscriberRecord.ice \ - Election.ice \ - IceStormInternal.ice) +icestormadmin_targetdir := $(bindir) +icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l \ + LLURecord.ice \ + SubscriberRecord.ice \ + Election.ice \ + IceStormInternal.ice) -icestormdb_targetdir := $(bindir) -icestormdb_dependencies := IcePatch2 IceDB -icestormdb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) +icestormdb_targetdir := $(bindir) +icestormdb_dependencies := IcePatch2 IceDB +icestormdb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) projects += $(project) diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk index 01a54fefc92..5ef610d4aa0 100644 --- a/cpp/src/IceStormLib/Makefile.mk +++ b/cpp/src/IceStormLib/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries := IceStorm +$(project)_libraries := IceStorm -IceStorm_targetdir := $(libdir) -IceStorm_dependencies := Ice -IceStorm_sliceflags := --include-dir IceStorm +IceStorm_targetdir := $(libdir) +IceStorm_dependencies := Ice +IceStorm_sliceflags := --include-dir IceStorm projects += $(project) diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk index ec19f637898..de5b761145a 100644 --- a/cpp/src/IceUtil/Makefile.mk +++ b/cpp/src/IceUtil/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries = IceUtil +$(project)_libraries = IceUtil -IceUtil_targetdir := $(libdir) -IceUtil_cppflags := $(if $(filter yes,$(libbacktrace)),-DICE_LIBBACKTRACE) +IceUtil_targetdir := $(libdir) +IceUtil_cppflags := $(if $(filter yes,$(libbacktrace)),-DICE_LIBBACKTRACE) ifeq ($(os),Darwin) IceUtil_excludes = src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp @@ -18,8 +18,8 @@ endif # Always enable the static configuration for the IceUtil library and never # install it. -IceUtil_always_enable_configs := static +IceUtil_always_enable_configs := static IceUtil_always_enable_platforms := $(build-platform) -IceUtil_install_configs := none +IceUtil_install_configs := none projects += $(project) diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk index 666e56d1242..a62e55d9fa4 100644 --- a/cpp/src/IceXML/Makefile.mk +++ b/cpp/src/IceXML/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_libraries := IceXML +$(project)_libraries := IceXML -IceXML_targetdir := $(libdir) -IceXML_dependencies := Ice -IceXML_cppflags := -DICE_XML_API_EXPORTS -IceXML_libs := expat +IceXML_targetdir := $(libdir) +IceXML_dependencies := Ice +IceXML_cppflags := -DICE_XML_API_EXPORTS +IceXML_libs := expat projects += $(project) diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk index 809910a395a..b242a7ac094 100644 --- a/cpp/src/Slice/Makefile.mk +++ b/cpp/src/Slice/Makefile.mk @@ -7,16 +7,16 @@ # # ********************************************************************** -$(project)_libraries := Slice +$(project)_libraries := Slice -Slice_targetdir := $(libdir) -Slice_libs := mcpp +Slice_targetdir := $(libdir) +Slice_libs := mcpp # Always enable the static configuration for the Slice library and never # install it -Slice_always_enable_configs := static -Slice_always_enable_platforms := $(build-platform) -Slice_install_configs := none -Slice_bisonflags := --name-prefix "slice_" +Slice_always_enable_configs := static +Slice_always_enable_platforms := $(build-platform) +Slice_install_configs := none +Slice_bisonflags := --name-prefix "slice_" projects += $(project) diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk index a1c382f863f..258617affd9 100644 --- a/cpp/src/icegriddb/Makefile.mk +++ b/cpp/src/icegriddb/Makefile.mk @@ -16,7 +16,7 @@ $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h icegriddb_targetdir := $(bindir) icegriddb_dependencies := Ice IceDB Glacier2 -icegriddb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegriddb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegriddb_sources := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \ $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice) diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk index b9666d51d2f..e76aded7f96 100644 --- a/cpp/test/Common/Makefile.mk +++ b/cpp/test/Common/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(project)_libraries = TestCommon -$(project)_noinstall := 1 +$(project)_libraries = TestCommon +$(project)_noinstall := 1 # # Put the shared TestCommon library in the lib directory for convenience on platforms # which don't support something like @loader_path. # -TestCommon[shared]_targetdir := lib -TestCommon_dependencies := Ice -TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include +TestCommon[shared]_targetdir := lib +TestCommon_dependencies := Ice +TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include projects += $(project) diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk index b25b873de26..98d85105a0e 100644 --- a/cpp/test/Ice/background/Makefile.mk +++ b/cpp/test/Ice/background/Makefile.mk @@ -7,22 +7,22 @@ # # ********************************************************************** -$(test)_libraries := $(test)_TestTransport -$(test)_cppflags := -I$(srcdir) +$(test)_libraries := $(test)_TestTransport +$(test)_cppflags := -I$(srcdir) -$(test)_client_sources = Client.cpp AllTests.cpp -$(test)_client_dependencies := $(test)_TestTransport +$(test)_client_sources = Client.cpp AllTests.cpp +$(test)_client_dependencies := $(test)_TestTransport -$(test)_server_sources = Server.cpp TestI.cpp -$(test)_server_dependencies := $(test)_TestTransport +$(test)_server_sources = Server.cpp TestI.cpp +$(test)_server_dependencies := $(test)_TestTransport $(test)_TestTransport_sources = Test.ice \ - Configuration.cpp \ - Connector.cpp \ - Acceptor.cpp \ - EndpointI.cpp \ - Transceiver.cpp \ - EndpointFactory.cpp \ - PluginI.cpp + Configuration.cpp \ + Connector.cpp \ + Acceptor.cpp \ + EndpointI.cpp \ + Transceiver.cpp \ + EndpointFactory.cpp \ + PluginI.cpp tests += $(test) diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk index 09453fc30b5..9550c05bd3e 100644 --- a/cpp/test/Ice/checksum/Makefile.mk +++ b/cpp/test/Ice/checksum/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_sliceflags = --checksum -$(test)_client_sources = $(test-client-sources) ClientTypes.ice -$(test)_server_sources = $(test-server-sources) ServerTypes.ice +$(test)_sliceflags = --checksum +$(test)_client_sources = $(test-client-sources) ClientTypes.ice +$(test)_server_sources = $(test-server-sources) ServerTypes.ice tests += $(test) diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk index c9806fb6ec6..0dd25b7728d 100644 --- a/cpp/test/Ice/custom/Makefile.mk +++ b/cpp/test/Ice/custom/Makefile.mk @@ -7,27 +7,27 @@ # # ********************************************************************** -$(test)_client_sources = Client.cpp \ - AllTests.cpp \ - Test.ice \ - Wstring.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_client_sources = Client.cpp \ + AllTests.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp -$(test)_server_sources = Server.cpp \ - TestI.cpp \ - WstringI.cpp \ - Test.ice \ - Wstring.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_server_sources = Server.cpp \ + TestI.cpp \ + WstringI.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp -$(test)_serveramd_sources = ServerAMD.cpp \ - TestAMDI.cpp \ - WstringAMDI.cpp \ - TestAMD.ice \ - WstringAMD.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_serveramd_sources = ServerAMD.cpp \ + TestAMDI.cpp \ + WstringAMDI.cpp \ + TestAMD.ice \ + WstringAMD.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp tests += $(test) diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk index 2eca6465fa6..f5c6082af3f 100644 --- a/cpp/test/Ice/echo/Makefile.mk +++ b/cpp/test/Ice/echo/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp +$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp tests += $(test) diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk index e814e47c2f9..d95e9015bf3 100644 --- a/cpp/test/Ice/impl/Makefile.mk +++ b/cpp/test/Ice/impl/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_server_impl = Test -$(test)_serveramd_impl = TestAMD +$(test)_server_impl = Test +$(test)_serveramd_impl = TestAMD # # $(call make-impl-with-config,$1=project,$2=component,$3=platform,$4=config,$5=comp[platform-config]) @@ -16,9 +16,9 @@ $(test)_serveramd_impl = TestAMD define make-impl-with-config ifneq ($$($2_impl),) -$5_sources += $$($5_objdir)/$$($2_impl)I.cpp -$5_objects += $$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_objdir)/$$($2_impl)I.cpp)) -$5_cppflags += -I$$($5_objdir) +$5_sources += $$($5_objdir)/$$($2_impl)I.cpp +$5_objects += $$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_objdir)/$$($2_impl)I.cpp)) +$5_cppflags += -I$$($5_objdir) $$($5_objects): $$($5_objdir)/$$($2_impl)I.cpp diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk index 88f2364cde6..61ac317b125 100644 --- a/cpp/test/Ice/library/Makefile.mk +++ b/cpp/test/Ice/library/Makefile.mk @@ -9,15 +9,15 @@ $(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests -$(test)_GenCode_sources := Test.ice +$(test)_GenCode_sources := Test.ice -$(test)_Consumer_sources := Consumer.cpp -$(test)_Consumer_dependencies := $(test)_GenCode +$(test)_Consumer_sources := Consumer.cpp +$(test)_Consumer_dependencies := $(test)_GenCode -$(test)_AllTests_sources := AllTests.cpp -$(test)_AllTests_dependencies := $(test)_GenCode $(test)_Consumer +$(test)_AllTests_sources := AllTests.cpp +$(test)_AllTests_dependencies := $(test)_GenCode $(test)_Consumer $(test)_client_sources := Client.cpp -$(test)_client_dependencies := $(test)_AllTests +$(test)_client_dependencies := $(test)_AllTests tests += $(test) diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk index 9735f51b50c..86b55596f39 100644 --- a/cpp/test/Ice/logger/Makefile.mk +++ b/cpp/test/Ice/logger/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_programs = client1 client2 client3 client4 client5 -$(test)_libs = iconv +$(test)_programs = client1 client2 client3 client4 client5 +$(test)_libs = iconv $(test)_client1_sources = Client1.cpp $(test)_client2_sources = Client2.cpp diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk index ac315fa695b..9cbae24e215 100644 --- a/cpp/test/Ice/objects/Makefile.mk +++ b/cpp/test/Ice/objects/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp -$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp -$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp +$(test)_sliceflags := -I$(test) +$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp +$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp +$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk index df098984495..237dab428bd 100644 --- a/cpp/test/Ice/operations/Makefile.mk +++ b/cpp/test/Ice/operations/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(test)_client_sources = Test.ice \ - Client.cpp \ - AllTests.cpp \ - Twoways.cpp \ - Oneways.cpp \ - TwowaysAMI.cpp \ - OnewaysAMI.cpp \ - BatchOneways.cpp \ - BatchOnewaysAMI.cpp +$(test)_client_sources = Test.ice \ + Client.cpp \ + AllTests.cpp \ + Twoways.cpp \ + Oneways.cpp \ + TwowaysAMI.cpp \ + OnewaysAMI.cpp \ + BatchOneways.cpp \ + BatchOnewaysAMI.cpp ifeq ($(xlc_compiler),yes) $(test)_cppflags += -qsuppress="1540-0895" diff --git a/cpp/test/Ice/plugin/Makefile.mk b/cpp/test/Ice/plugin/Makefile.mk index f6ba5fbc9a2..af482decc84 100644 --- a/cpp/test/Ice/plugin/Makefile.mk +++ b/cpp/test/Ice/plugin/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_libraries := $(test)_TestPlugin +$(test)_libraries := $(test)_TestPlugin $(test)_TestPlugin_sources := Plugin.cpp diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk index 0aea7ea7bd2..94b1fad8905 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mk +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = $(test-client-sources) ClientPrivate.ice -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk index 0aea7ea7bd2..94b1fad8905 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mk +++ b/cpp/test/Ice/slicing/objects/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = $(test-client-sources) ClientPrivate.ice -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk index 3c30722bcab..4dfed32a0c4 100644 --- a/cpp/test/Ice/threadPoolPriority/Makefile.mk +++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk @@ -9,6 +9,6 @@ $(test)_programs := client server servercustom -$(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp +$(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk index fee07a3380d..f3e2d7cb48e 100644 --- a/cpp/test/IceBox/admin/Makefile.mk +++ b/cpp/test/IceBox/admin/Makefile.mk @@ -9,9 +9,9 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = tests += $(test) diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk index fee07a3380d..f3e2d7cb48e 100644 --- a/cpp/test/IceBox/configuration/Makefile.mk +++ b/cpp/test/IceBox/configuration/Makefile.mk @@ -9,9 +9,9 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = tests += $(test) diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk index 92d4168f223..7b6f23f2e8e 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mk +++ b/cpp/test/IceGrid/deployer/Makefile.mk @@ -9,10 +9,10 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice $(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_version = +$(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk index 92d4168f223..7b6f23f2e8e 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk @@ -9,10 +9,10 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice $(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_version = +$(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk index 17a64e3dda1..680829b6ece 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mk +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk @@ -9,14 +9,14 @@ $(test)_libraries := $(test)_TestService $(test)_RegistryPlugin -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = -$(test)_RegistryPlugin_sources = RegistryPlugin.cpp -$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 +$(test)_RegistryPlugin_sources = RegistryPlugin.cpp +$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 -$(test)_client_dependencies = IceGrid Glacier2 +$(test)_client_dependencies = IceGrid Glacier2 tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk index 9efb2c5caf1..3b6a9a5eb4c 100644 --- a/cpp/test/IceGrid/session/Makefile.mk +++ b/cpp/test/IceGrid/session/Makefile.mk @@ -9,11 +9,11 @@ $(test)_programs = client server verifier -$(test)_client_dependencies = IceGrid Glacier2 +$(test)_client_dependencies = IceGrid Glacier2 -$(test)_server_dependencies = Glacier2 IceSSL +$(test)_server_dependencies = Glacier2 IceSSL -$(test)_verifier_sources = PermissionsVerifier.cpp Test.ice -$(test)_verifier_dependencies = Glacier2 +$(test)_verifier_sources = PermissionsVerifier.cpp Test.ice +$(test)_verifier_dependencies = Glacier2 tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk index 6d343c5060b..a0bb83fb19e 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mk +++ b/cpp/test/IceSSL/configuration/Makefile.mk @@ -10,7 +10,7 @@ $(test)_dependencies = IceSSL Ice TestCommon # Need to load certificates with functions from src/IceSSL/Util.h -$(test)[iphoneos]_cppflags := -Isrc -$(test)[iphonesimulator]_cppflags := -Isrc +$(test)[iphoneos]_cppflags := -Isrc +$(test)[iphonesimulator]_cppflags := -Isrc tests += $(test) diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk index eb14bf257dc..d1e5e23feab 100644 --- a/cpp/test/IceStorm/federation/Makefile.mk +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index 62787683f1f..93f8e4b8ad2 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk index f0a87e294ed..c0c73312cd6 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mk +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber sub -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber sub +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice -$(test)_sub_sources = Sub.cpp Single.ice +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_sub_sources = Sub.cpp Single.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk index 352c683d439..ec44f471cf9 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mk +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_client_sources = Client.cpp Single.ice +$(test)_client_sources = Client.cpp Single.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk index 862e7e80a7d..06630b48f47 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mk +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber control -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber control +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice -$(test)_control_sources = Control.cpp Controller.ice +$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice +$(test)_control_sources = Control.cpp Controller.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk index 74e1a2442b6..2e8d2fdf117 100644 --- a/cpp/test/IceStorm/single/Makefile.mk +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk index 4156b782084..f254df233f1 100644 --- a/cpp/test/IceStorm/stress/Makefile.mk +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/ios/controller/Makefile.mk b/cpp/test/ios/controller/Makefile.mk index 061f8a6b099..21d71171f64 100644 --- a/cpp/test/ios/controller/Makefile.mk +++ b/cpp/test/ios/controller/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_type = xcode -$(project)_platforms = iphonesimulator iphoneos -$(project)_configs = xcodesdk cpp11-xcodesdk -$(project)_dependencies = $(tests) -$(project)_project = C++ Test Controller.xcodeproj -$(project)_scheme = $(if $(filter cpp11-xcodesdk,$2),C++11 Test Controller,C++98 Test Controller) -$(project)_configuration = $(if $(filter $(OPTIMIZE),yes),Release,Debug) +$(project)_type = xcode +$(project)_platforms = iphonesimulator iphoneos +$(project)_configs = xcodesdk cpp11-xcodesdk +$(project)_dependencies = $(tests) +$(project)_project = C++ Test Controller.xcodeproj +$(project)_scheme = $(if $(filter cpp11-xcodesdk,$2),C++11 Test Controller,C++98 Test Controller) +$(project)_configuration = $(if $(filter $(OPTIMIZE),yes),Release,Debug) projects += $(project) tests:: $(project) |