diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-13 18:37:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-13 18:37:28 +0200 |
| commit | e305d33203086236280fe918072398918f87d6f4 (patch) | |
| tree | 91e3d323f699af35a0477ea935a6569d4a290dcf | |
| parent | Add MCPP_HOME for Windows build. (diff) | |
| download | ice-e305d33203086236280fe918072398918f87d6f4.tar.bz2 ice-e305d33203086236280fe918072398918f87d6f4.tar.xz ice-e305d33203086236280fe918072398918f87d6f4.zip | |
Fixed Makefile indentation to use tab witdh=8 and indent width = 4
116 files changed, 648 insertions, 663 deletions
@@ -7,13 +7,13 @@ # # ********************************************************************** -SUBDIRS = cpp java js python ruby php +SUBDIRS = cpp java js python ruby php CLEAN_SUBDIRS = js java python ruby php cpp DEPEND_SUBDIRS = cpp python ruby php INSTALL_SUBDIRS = cpp java python ruby php js ifeq ($(shell uname),Darwin) -SUBDIRS += objective-c +SUBDIRS += objective-c CLEAN_SUBDIRS += objective-c DEPEND_SUBDIRS += objective-c INSTALL_SUBDIRS += objective-c diff --git a/config/Make.common.rules b/config/Make.common.rules index 9d41f341c6b..726d2dd0164 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -11,22 +11,22 @@ # Don't change anything below this line! # ---------------------------------------------------------------------- -SHELL = /bin/sh +SHELL = /bin/sh VERSION_MAJOR = 3 VERSION_MINOR = 6 VERSION_PATCH = 0 VERSION = 3.6.0 SHORT_VERSION = 3.6 -SOVERSION = 36 +SOVERSION = 36 -INSTALL = cp -fp +INSTALL = cp -fp INSTALL_PROGRAM = ${INSTALL} INSTALL_LIBRARY = ${INSTALL} INSTALL_DATA = ${INSTALL} -OBJEXT = .o +OBJEXT = .o -UNAME := $(shell uname) +UNAME := $(shell uname) MACHINE_TYPE := $(shell uname -m) # @@ -92,14 +92,14 @@ ifeq ($(UNAME),Linux) ifeq ($(shell test -d $(usr_dir)/lib/x86_64-linux-gnu && echo 0),0) lp64suffix = /x86_64-linux-gnu endif - + # # Rhel/SLES # ifeq ($(shell test -d $(usr_dir)/lib64 && echo 0),0) lp64suffix = 64 endif - + ifeq ($(LP64),) LP64 = yes endif @@ -130,43 +130,43 @@ ifneq ($(findstring MINGW,$(UNAME)),) COMPILER_MACHINE := $(shell $(CXX) -dumpmachine) ifeq ($(COMPILER_MACHINE),x86_64-w64-mingw32) LP64 := yes - endif + endif endif ifeq ($(LP64),yes) - libsubdir := lib$(lp64suffix) - binsubdir := bin$(lp64binsuffix) + libsubdir := lib$(lp64suffix) + binsubdir := bin$(lp64binsuffix) else - libsubdir := lib$(lp32suffix) - binsubdir := bin - # - # For x86 builds in x86_64 machines lib64subdir points to the x86_64 lib - # directory and libsubdir to the x86 lib directory. - # - ifeq ($(MACHINE_TYPE),x86_64) - ifeq ($(UNAME),Linux) - ifeq ($(shell test -d $(usr_dir)/lib/x86_64-linux-gnu && echo 0),0) - lib64subdir = lib/x86_64-linux-gnu - else - lib64subdir = lib$(lp64suffix) - endif - endif + libsubdir := lib$(lp32suffix) + binsubdir := bin + # + # For x86 builds in x86_64 machines lib64subdir points to the x86_64 lib + # directory and libsubdir to the x86 lib directory. + # + ifeq ($(MACHINE_TYPE),x86_64) + ifeq ($(UNAME),Linux) + ifeq ($(shell test -d $(usr_dir)/lib/x86_64-linux-gnu && echo 0),0) + lib64subdir = lib/x86_64-linux-gnu + else + lib64subdir = lib$(lp64suffix) + endif endif + endif endif # # The following variables might also be defined: -# +# # - slice_translator: the name of the slice translator required for the build. # Setting this variable is required when building source trees other than the # the source distribution (e.g.: the demo sources). -# +# # - ice_require_cpp: define this variable to check for the presence of the C++ # dev kit and check for the existence of the include/Ice/Config.h header. # # -# First, check if we're building a source distribution. +# First, check if we're building a source distribution. # # If building from a source distribution, ice_dir is defined to the # top-level directory of the source distribution and ice_cpp_dir is @@ -179,8 +179,8 @@ ifndef ice_bin_dist ice_src_dist = 1 # - # When building a source distribution, if ICE_HOME is specified, it takes precedence over - # the source tree for building the language mappings. For example, this can be used to + # When building a source distribution, if ICE_HOME is specified, it takes precedence over + # the source tree for building the language mappings. For example, this can be used to # build the Python language mapping using the translators from the distribution specified # by ICE_HOME. # @@ -214,8 +214,8 @@ $(warning Ignoring ICE_HOME environment variable to build current source tree.) ice_src_dist = 1 # - # When building a source distribution, if ICE_HOME is specified, it takes precedence over - # the source tree for building the language mappings. For example, this can be used to + # When building a source distribution, if ICE_HOME is specified, it takes precedence over + # the source tree for building the language mappings. For example, this can be used to # build the Python language mapping using the translators from the distribution specified # by ICE_HOME. # @@ -255,7 +255,7 @@ $(error Unable to find $(slice_translator) in $(ICE_HOME)/$(binsubdir), please v else ifeq ($(shell test -f $(top_srcdir)/bin/$(slice_translator) && echo 0), 0) ice_dir = $(top_srcdir) - else + else ifeq ($(shell test -f $(usr_dir)/bin/$(slice_translator) && echo 0), 0) ice_dir = $(usr_dir) ifeq ($(shell test -f /opt/Ice-$(VERSION)/bin/$(slice_translator) && echo 0), 0) @@ -350,7 +350,6 @@ ifneq ($(ice_dir), $(usr_dir)) export DYLD_LIBRARY_PATH := $(ice_lib_dir):$(DYLD_LIBRARY_PATH) endif - ifeq ($(UNAME),SunOS) ifeq ($(LP64),yes) export LD_LIBRARY_PATH_64 := $(ice_lib_dir):$(LD_LIBRARY_PATH_64) @@ -407,7 +406,7 @@ endif ifeq ($(mklibname),) ifeq ($(STATICLIBS),yes) - mklibname = lib$(1)$(cpp11libsuffix).a + mklibname = lib$(1)$(cpp11libsuffix).a else ifeq ($(UNAME),Darwin) mklibname = lib$(1).dylib @@ -419,21 +418,21 @@ endif ifndef mklibtargets ifeq ($(STATICLIBS),yes) - mklibtargets = $(3) + mklibtargets = $(3) else - mklibtargets = $(1) $(2) $(3) + mklibtargets = $(1) $(2) $(3) endif endif ifeq ($(installlib),) ifeq ($(STATICLIBS),yes) - installlib = $(INSTALL) $(2)/$(5) $(1); \ - chmod a+rx $(1)/$(5) + installlib = $(INSTALL) $(2)/$(5) $(1); \ + chmod a+rx $(1)/$(5) else - installlib = $(INSTALL) $(2)/$(3) $(1); \ - rm -f $(1)/$(4); ln -s $(3) $(1)/$(4); \ - rm -f $(1)$(cpp11libdirsuffix)/$(5); ln -s $(cpp11sonamedir)$(4) $(1)$(cpp11libdirsuffix)/$(5); \ - chmod a+rx $(1)/$(3) + installlib = $(INSTALL) $(2)/$(3) $(1); \ + rm -f $(1)/$(4); ln -s $(3) $(1)/$(4); \ + rm -f $(1)$(cpp11libdirsuffix)/$(5); ln -s $(cpp11sonamedir)$(4) $(1)$(cpp11libdirsuffix)/$(5); \ + chmod a+rx $(1)/$(3) endif endif @@ -454,10 +453,10 @@ endif all:: -ifeq ($(wildcard $(top_srcdir)/../ICE_LICENSE.txt),) +ifeq ($(wildcard $(top_srcdir)/../ICE_LICENSE.txt),) TEXT_EXTENSION = -else - TEXT_EXTENSION = .txt +else + TEXT_EXTENSION = .txt endif install-common:: @@ -489,16 +488,16 @@ install-common:: fi @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \ - then \ - $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ - fi + then \ + $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ + fi @if test ! -f $(DESTDIR)$(install_bindir)/hashpassword.py ; \ - then \ - if test ! -d $(DESTDIR)$(install_bindir) ; \ - then \ - echo "Creating $(DESTDIR)$(install_bindir)..." ; \ - $(call mkdir, $(DESTDIR)$(install_bindir), -p) ; \ - fi ; \ - $(call installprogram,$(top_srcdir)/../scripts/hashpassword.py,$(DESTDIR)$(install_bindir)) ; \ - fi + then \ + if test ! -d $(DESTDIR)$(install_bindir) ; \ + then \ + echo "Creating $(DESTDIR)$(install_bindir)..." ; \ + $(call mkdir, $(DESTDIR)$(install_bindir), -p) ; \ + fi ; \ + $(call installprogram,$(top_srcdir)/../scripts/hashpassword.py,$(DESTDIR)$(install_bindir)) ; \ + fi diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 29ac97bc582..1a43d2bd683 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -11,14 +11,14 @@ # Don't change anything below this line! # ---------------------------------------------------------------------- -SHELL = /bin/sh -VERSION = 3.6.0 -INTVERSION = 3.6.0 -SHORT_VERSION = 3.6 -PATCH_VERSION = 0 -SOVERSION = 36 +SHELL = /bin/sh +VERSION = 3.6.0 +INTVERSION = 3.6.0 +SHORT_VERSION = 3.6 +PATCH_VERSION = 0 +SOVERSION = 36 -OBJEXT = .obj +OBJEXT = .obj # # Ensure ice_language has been set by the file that includes this one. @@ -184,6 +184,8 @@ slicedir = $(ice_dir)\slice install_slicedir = $(prefix)\slice !endif +install_bindir = $(prefix)\bin$(x64suffix) + all:: !if exist ($(top_srcdir)\..\ICE_LICENSE.txt) @@ -197,20 +199,21 @@ install-common:: !if "$(WINRT)" != "yes" && "$(install_slicedir)" != "" @if not exist "$(install_slicedir)" \ - @echo "Creating $(install_slicedir)..." && \ - mkdir "$(install_slicedir)" && \ - @echo "Copying slice files..." && \ - cmd /c "xcopy /s /y $(top_srcdir)\..\slice "$(install_slicedir)"" || exit 1 - - @if not exist "$(install_bindir)" \ - @echo "Creating $(install_bindir)..." && \ - mkdir "$(install_bindir)" - - @if not exist "$(install_bindir)\hashpassword.py" \ - copy $(top_srcdir)\..\scripts\hashpassword.py "$(install_bindir)"" + @echo "Creating $(install_slicedir)..." && \ + mkdir "$(install_slicedir)" && \ + @echo "Copying slice files..." && \ + cmd /c "xcopy /s /y $(top_srcdir)\..\slice "$(install_slicedir)"" || exit 1 +!endif + + @if not exist "$(install_bindir)" \ + @echo "Creating $(install_bindir)..." && \ + mkdir "$(install_bindir)" + + @if not exist "$(install_bindir)\hashpassword.py" \ + @copy $(top_srcdir)\..\scripts\hashpassword.py "$(install_bindir)"" @if not exist "$(prefix)\ICE_LICENSE$(TEXT_EXT)" \ @copy $(top_srcdir)\..\ICE_LICENSE$(TEXT_EXT) "$(prefix)" @if not exist "$(prefix)\LICENSE$(TEXT_EXT)" \ @copy $(top_srcdir)\..\LICENSE$(TEXT_EXT) "$(prefix)" -!endif + diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index 0471ae612f2..3eef76eaa62 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -14,25 +14,23 @@ top_srcdir = . !if "$(WINRT)" != "yes" SUBDIRS = config src include test -!if "$(CPP_COMPILER)" != "VC100" -SUBDIRS = $(SUBDIRS) -!endif INSTALL_SUBDIRS = "$(install_bindir)" "$(install_libdir)" "$(install_includedir)" "$(install_configdir)" install:: install-common @for %i in ( $(INSTALL_SUBDIRS) ) do \ - @if not exist %i \ - @echo "Creating %i..." && \ - mkdir %i + @if not exist %i \ + @echo "Creating %i..." && \ + mkdir %i @for %i in ( config src include ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 + @echo "making $@ in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 test:: @python $(top_srcdir)/allTests.py !else + SUBDIRS = src include test INSTALL_SUBDIRS = $(prefix)\SDKs diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 28b93c8e50b..cdd3315faf8 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -21,7 +21,7 @@ prefix ?= /opt/Ice-$(VERSION) # # The "root directory" for runpath embedded in executables. Can be set -# to change the runpath added to Ice executables. The default is +# to change the runpath added to Ice executables. The default is # platform dependent. # #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) @@ -37,14 +37,14 @@ create_runpath_symlink ?= no # Define embedded_runpath as no if you don't want any RPATH added to # the executables. # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define new_dtags as yes if you want the linker to enable the new style # dtags, this will cause the linker to add a runpath entry instead of # a rpath entry. This only aplly to gcc builds on linux # -new_dtags ?= no +new_dtags ?= no # # Define LP64 as yes or no if you want force a 32 or 64 bit. The @@ -61,7 +61,7 @@ new_dtags ?= no # "-arch i386 -arch x86_64". The default is OS version dependent. Be # aware that this value may conflict with the setting of LP64 above. # -#CXXARCHFLAGS = -arch i386 -arch x86_64 +#CXXARCHFLAGS = -arch i386 -arch x86_64 # # Define USE_READLINE as yes if you want to build parts of Ice using @@ -144,13 +144,13 @@ USE_READLINE ?= no # # Default Mutex protocol: one of PrioNone or PrioInherit. # -#DEFAULT_MUTEX_PROTOCOL ?= PrioNone +#DEFAULT_MUTEX_PROTOCOL ?= PrioNone # # Define CPP11 as yes if you want to enable C++11 features in GCC or # Clang. # -#CPP11 ?= yes +#CPP11 ?= yes # ---------------------------------------------------------------------- # Don't change anything below this line! @@ -185,9 +185,9 @@ headerdir = $(top_srcdir)/include # because it is used in the .depend files # ifdef ice_src_dist - includedir = $(top_srcdir)/include +includedir = $(top_srcdir)/include else - includedir = $(ice_dir)/include +includedir = $(ice_dir)/include endif # @@ -208,12 +208,12 @@ install_mandir := $(prefix)/share/man/man1 endif ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) - ICEUTIL_FLAGS = -DICE_PRIO_INHERIT + ICEUTIL_FLAGS = -DICE_PRIO_INHERIT endif OPENSSL_FLAGS += $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) ifeq ($(OPENSSL_LIBS),) - OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto + OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto endif OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir))) @@ -222,61 +222,61 @@ ifeq ($(SSL_OS_LIBS),) endif ifneq ($(BZIP2_HOME),) - BZIP2_FLAGS = I$(BZIP2_HOME)/include) + BZIP2_FLAGS = I$(BZIP2_HOME)/include) endif ifeq ($(BZIP2_LIBS),) - BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2 + BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2 endif BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir))) ifeq ($(ICONV_LIBS),) - ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB) + ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB) endif ifneq ($(DB_HOME),) - DB_FLAGS = -I$(DB_HOME)/include - ifeq ($(DB_LIBS),) - DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx - endif - DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) + DB_FLAGS = -I$(DB_HOME)/include + ifeq ($(DB_LIBS),) + DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx + endif + DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) else - ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/include/db53 - DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx - else - ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/local/include/db53 - DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx - else - DB_LIBS = -ldb_cxx - endif + ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes) + DB_FLAGS = -I/usr/include/db53 + DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx + else + ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes) + DB_FLAGS = -I/usr/local/include/db53 + DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx + else + DB_LIBS = -ldb_cxx + endif endif endif EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include) ifeq ($(EXPAT_LIBS),) - EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat + EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat endif EXPAT_RPATH_LINK = $(if $(EXPAT_HOME),$(call rpathlink,$(EXPAT_HOME)/$(libsubdir))) ifeq ($(MCPP_LIBS),) - ifeq ($(MCPP_HOME),) - # - # If libmcpp.a is in the third-party subdirectory, we are building the core C++ distribution - # and we used that mcpp package. - # - ifneq ($(wildcard ../../../third-party/mcpp/lib/libmcpp.a),) - MCPP_HOME = ../../../third-party/mcpp - endif + ifeq ($(MCPP_HOME),) + # + # If libmcpp.a is in the third-party subdirectory, we are building the core C++ distribution + # and we used that mcpp package. + # + ifneq ($(wildcard ../../../third-party/mcpp/lib/libmcpp.a),) + MCPP_HOME = ../../../third-party/mcpp endif - MCPP_LIBS = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp + endif + MCPP_LIBS = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp endif ifeq ($(PLATFORM_HAS_READLINE),yes) - ifeq ($(USE_READLINE),yes) + ifeq ($(USE_READLINE),yes) READLINE_FLAGS = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include) READLINE_LIBS = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline - endif + endif endif ICECPPFLAGS = -I$(slicedir) @@ -284,70 +284,70 @@ ICECPPFLAGS = -I$(slicedir) SLICE2CPPFLAGS = $(ICECPPFLAGS) ifeq ($(ice_dir), $(usr_dir)) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) - ifeq ($(CPP11),yes) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) - endif + LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) + ifeq ($(CPP11),yes) + LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) + endif else - CPPFLAGS += -I$(includedir) - ifdef ice_src_dist + CPPFLAGS += -I$(includedir) + ifdef ice_src_dist LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)$(cpp11libdirsuffix) - else + else LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) - endif + endif endif ifeq ($(FLEX_NOLINE),yes) - FLEXFLAGS := -L + FLEXFLAGS := -L else - FLEXFLAGS := + FLEXFLAGS := endif ifeq ($(BISON_NOLINE),yes) - BISONFLAGS := -dvtl + BISONFLAGS := -dvtl else - BISONFLAGS := -dvt + BISONFLAGS := -dvt endif ifeq ($(mkshlib),) - $(error You need to define mkshlib in Make.rules.$(UNAME)) + $(error You need to define mkshlib in Make.rules.$(UNAME)) endif ifeq ($(mktestname),) - mktestname = $(1)$(EXE_EXT) + mktestname = $(1)$(EXE_EXT) endif ifeq ($(mktest),) - mktest = $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $(@) $(2) $(3) + mktest = $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $(@) $(2) $(3) endif ifdef ice_src_dist ifeq ($(STATICLIBS),yes) - SLICEPARSERLIB = + SLICEPARSERLIB = else - SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) endif - SLICE2CPP = $(bindir)/slice2cpp - SLICE2FREEZE = $(bindir)/slice2freeze + SLICE2CPP = $(bindir)/slice2cpp + SLICE2FREEZE = $(bindir)/slice2freeze else - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) - endif - SLICE2CPP = $(ice_dir)/$(binsubdir)/slice2cpp - SLICE2FREEZE = $(ice_dir)/$(binsubdir)/slice2freeze + SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) + ifeq ($(wildcard $(SLICEPARSERLIB)),) + SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) + endif + SLICE2CPP = $(ice_dir)/$(binsubdir)/slice2cpp + SLICE2FREEZE = $(ice_dir)/$(binsubdir)/slice2freeze endif ifeq ($(SLICE_LIBS),) - ifeq ($(STATICLIBS),yes) - SLICE_LIBS = -lSlice -lmcpp $(BASELIBS) - else - SLICE_LIBS = -lSlice $(BASELIBS) - endif + ifeq ($(STATICLIBS),yes) + SLICE_LIBS = -lSlice -lmcpp $(BASELIBS) + else + SLICE_LIBS = -lSlice $(BASELIBS) + endif endif ifeq ($(ICESSL_LIBS),) - ICESSL_LIBS = -lIceSSL + ICESSL_LIBS = -lIceSSL endif EVERYTHING = all clean install compile-slice diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index d672de5c8c3..e3892b8bed3 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -20,14 +20,14 @@ CXXFLAGS += -Wall -Werror -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION) # If MAXWARN is set then enable extra warnings ifeq ($(MAXWARN),yes) - CXXFLAGS += -Wextra -Wshadow -Wredundant-decls + CXXFLAGS += -Wextra -Wshadow -Wredundant-decls endif # # By default we build x86_64 binaries. # ifeq ($(CXXARCHFLAGS),) -CXXARCHFLAGS := -arch x86_64 +CXXARCHFLAGS := -arch x86_64 endif ifeq ($(OPTIMIZE),yes) @@ -47,7 +47,7 @@ endif # # C++ run-time libraries, necessary for linking some shared libraries. # -CXXLIBS = +CXXLIBS = clean:: rm -f *.keychain *.fl* diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 5668097a15f..659e7d1f27e 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -45,12 +45,12 @@ ifeq ($(CXX),g++) # # We are an ultra, at least, and so have the atomic instructions # - $(warning ===================================================================) + $(warning ===================================================================) $(warning Linux on SPARC is currently unsupported. The Ice team does not) $(warning maintain SPARC specific portions of the source code or build) $(warning system. Contact sales@zeroc.com if you wish to sponsor official) $(warning support.) - $(warning ===================================================================) + $(warning ===================================================================) USE_SPARC_ASM = yes CXXARCHFLAGS += -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM endif @@ -61,12 +61,12 @@ ifeq ($(CXX),g++) # On sun4m, there is a bug in some CPU/kernel/gcc configurations which # prevent us from using '-mcpu=v8' # - $(warning ===================================================================) + $(warning ===================================================================) $(warning Linux on SPARC is currently unsupported. The Ice team does not) $(warning maintain SPARC specific portions of the source code or build) $(warning system. Contact sales@zeroc.com if you wish to sponsor official) $(warning support.) - $(warning ===================================================================) + $(warning ===================================================================) USE_SPARC_ASM = no CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED endif @@ -85,7 +85,7 @@ ifeq ($(CXX),g++) ifeq ($(MAXWARN),yes) CXXFLAGS += -Wextra -Wshadow GCC_GTEQ_460 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40600) - ifeq ($(GCC_GTEQ_460),1) + ifeq ($(GCC_GTEQ_460),1) CXXFLAGS += -Wredundant-decls endif endif @@ -97,9 +97,9 @@ ifeq ($(CXX),g++) ifeq ($(OPTIMIZE),yes) CXXFLAGS += -O2 -DNDEBUG else - CXXFLAGS += -g + CXXFLAGS += -g endif - + # # Add RPATH to LDEXEFLAGS if embedded_runpath is set to yes # @@ -123,7 +123,7 @@ ifeq ($(CXX),g++) ifeq ($(prefix), $(usr_dir)) RPATH_DIR = endif - + # # Clear the rpath dir when building agains system install. # @@ -156,20 +156,20 @@ ifeq ($(CXX),g++) mklib = ar cr $(1) $(2) - rpathlink = -Wl,-rpath-link,$(1) + rpathlink = -Wl,-rpath-link,$(1) LDPLATFORMFLAGS += -rdynamic endif ifeq ($(CXX),icpc) - $(warning ===================================================================) + $(warning ===================================================================) $(warning Intel C++ is currently not supported. The Ice team does not) $(warning maintain Intel C++ specific portions of the source code or build) $(warning system. Contact sales@zeroc.com if you wish to sponsor official) $(warning support.) - $(warning ===================================================================) - CXXFLAGS = -D_REENTRANT + $(warning ===================================================================) + CXXFLAGS = -D_REENTRANT ifneq ($(GENPIC),no) CXXFLAGS += -fPIC @@ -190,7 +190,7 @@ ifeq ($(CXX),icpc) mklib = ar cr $(1) $(2) - rpathlink = -Wl,-rpath-link,$(1) + rpathlink = -Wl,-rpath-link,$(1) endif @@ -201,7 +201,7 @@ ifneq ($(NPTL_LIB),) endif ICESSL_LIBS = $(OPENSSL_RPATH_LINK) -lIceSSL -LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) +LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) CRYPT_OS_LIBS = -lcrypt ICEUTIL_OS_LIBS = -lrt $(OPENSSL_RPATH_LINK) -lcrypto diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index 8a67774be2c..8c54d512fa8 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -12,7 +12,7 @@ # # -# If CXX is not defined anywhere, the default (from gmake) is g++. +# If CXX is not defined anywhere, the default (from gmake) is g++. # CXX = CC @@ -27,13 +27,12 @@ ifeq ($(CXX),CC) # # Recent version of Sun CC # - ifeq ($(LP64),yes) CXXARCHFLAGS += -m64 else CXXARCHFLAGS += -m32 endif - + # # wvarhidenmem,wvarhidemem: various name hiding # notemsource: Could not find source for <template name> @@ -53,15 +52,13 @@ ifeq ($(CXX),CC) else CXXFLAGS += -g endif - + mkshlib = $(CXX) -G $(LDFLAGS) -o $(1) -h $(2) $(3) $(4) mklib = $(CXX) -xar -o $(1) $(2) - CXXLIBS = -lCrun -lCstd - ifneq ($(embedded_runpath_prefix),) LDPLATFORMFLAGS = -norunpath -R $(runpath_libdir) -z text $(PLATFORMLIBDIRS) else @@ -93,7 +90,7 @@ ifeq ($(CXX),g++) else CXXFLAGS += -g endif - + mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -h $(2) $(3) $(4) mklib = ar cr $(1) $(2) @@ -116,4 +113,3 @@ LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) ICEUTIL_OS_LIBS = -lpthread -lrt -lcrypto ICE_OS_LIBS = -ldl -lsocket - diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index c1d1f6c0619..e4d556f6e54 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -114,7 +114,6 @@ includedir = $(top_srcdir)\include includedir = $(ice_dir)\include !endif -install_bindir = $(prefix)\bin$(x64suffix) install_libdir = $(prefix)\lib$(x64suffix) install_includedir = $(prefix)\include install_configdir = $(prefix)\config diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 19d45244fe9..28e1788bdff 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -82,9 +82,9 @@ LDFLAGS = $(LDFLAGS) /nologo LDFLAGS = $(LDFLAGS) /NXCOMPAT /MANIFEST:NO /APPCONTAINER /NOLOGO !if "$(CPP_COMPILER)" == "VC120" !if "$(ARCH)" == "x86" -LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store" +LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store" !else -LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store\$(ARCH)" +LDFLAGS = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store\$(ARCH)" !endif !else LDFLAGS = $(LDFLAGS) /FIXED:no @@ -174,4 +174,3 @@ sdks: $(SDK_LIBRARY_PATH) $(SDK_REDIST_PATH) $(SDK_REFERENCES_PATH) $(SDK_BASE_P !endif - diff --git a/cpp/include/Glacier2/Makefile.mak b/cpp/include/Glacier2/Makefile.mak index 0040de0c326..5f57945c667 100644 --- a/cpp/include/Glacier2/Makefile.mak +++ b/cpp/include/Glacier2/Makefile.mak @@ -28,7 +28,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/include/Ice/Makefile.mak b/cpp/include/Ice/Makefile.mak index 9cc56abbff5..f6443bc3fa0 100644 --- a/cpp/include/Ice/Makefile.mak +++ b/cpp/include/Ice/Makefile.mak @@ -28,7 +28,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/include/IceGrid/Makefile.mak b/cpp/include/IceGrid/Makefile.mak index 761292962fa..8fb9e137e76 100644 --- a/cpp/include/IceGrid/Makefile.mak +++ b/cpp/include/IceGrid/Makefile.mak @@ -28,7 +28,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak index c75ebd96b09..07028a332c1 100644 --- a/cpp/include/IceSSL/Makefile.mak +++ b/cpp/include/IceSSL/Makefile.mak @@ -28,7 +28,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/include/IceStorm/Makefile.mak b/cpp/include/IceStorm/Makefile.mak index dd143e6c158..91888169e6b 100644 --- a/cpp/include/IceStorm/Makefile.mak +++ b/cpp/include/IceStorm/Makefile.mak @@ -28,7 +28,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/include/IceUtil/Makefile.mak b/cpp/include/IceUtil/Makefile.mak index e79566e752a..f1a63f3143a 100644 --- a/cpp/include/IceUtil/Makefile.mak +++ b/cpp/include/IceUtil/Makefile.mak @@ -27,7 +27,7 @@ install:: all:: @echo SDK_HEADERS = \> .headers @for /f %i in ('dir /b *.h') do \ - @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers + @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers !include .headers diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 8b017532e20..a1f0d151f28 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -15,7 +15,7 @@ LIBNAME = $(call mklibname,Freeze) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) -SLICE_OBJS = BackgroundSaveEvictor.o \ +SLICE_OBJS = BackgroundSaveEvictor.o \ CatalogData.o \ Connection.o \ ConnectionF.o \ diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index b69cb80721d..cd25fd9f481 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -25,7 +25,7 @@ COMMON_OBJS = AssignVisitor.o \ Util.o \ Grammar.o -TRANSFORM_OBJS = TransformAnalyzer.o \ +TRANSFORM_OBJS = TransformAnalyzer.o \ TransformVisitor.o \ Transformer.o \ transformdb.o diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index e6f133ca4f9..8d2fca43101 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -54,7 +54,7 @@ SLICE_OBJS = BuiltinSequences.o \ SliceChecksumDict.o \ Version.o -OBJS = Acceptor.o \ +OBJS = Acceptor.o \ ACM.o \ Application.o \ AsyncResult.o \ diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 33ed98f7a81..14da8e051d9 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -16,7 +16,7 @@ REGISTRY_SERVER = $(bindir)/icegridregistry TARGETS = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) SLICE_OBJS = Internal.o \ - IceLocatorDiscovery.o + IceLocatorDiscovery.o ADMIN_OBJS = Client.o \ DescriptorBuilder.o \ diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 32ddf0acc2a..c9a2bdc68a7 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -17,8 +17,8 @@ NODE_SERVER_R = $(top_srcdir)\bin\icegridnode.exe NODE_SERVER = $(top_srcdir)\bin\icegridnode$(LIBSUFFIX).exe -REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe -REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe +REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe +REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index 61b3f92d3aa..e6439145991 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -33,17 +33,17 @@ OBJS = AcceptorI.o \ ifneq ($(findstring MINGW,$(shell uname)),) OBJS := $(OBJS) \ - SChannelEngine.o \ - SChannelTransceiverI.o + SChannelEngine.o \ + SChannelTransceiverI.o else ifeq ($(shell uname),Darwin) OBJS := $(OBJS) \ - SecureTransportEngine.o \ - SecureTransportTransceiverI.o + SecureTransportEngine.o \ + SecureTransportTransceiverI.o else OBJS := $(OBJS) \ - OpenSSLEngine.o \ - OpenSSLTransceiverI.o + OpenSSLEngine.o \ + OpenSSLTransceiverI.o endif endif diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index d382aa6b4f5..2e83e626554 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -9,9 +9,9 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) -SONAME = $(call mksoname,IceStormService,$(SOVERSION)) -LIBNAME = $(call mklibname,IceStormService) +LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) +SONAME = $(call mksoname,IceStormService,$(SOVERSION)) +LIBNAME = $(call mklibname,IceStormService) ADMIN = $(bindir)/icestormadmin MIGRATE = $(bindir)/icestormmigrate diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile index a15cc4df501..70230eff513 100644 --- a/cpp/src/IceXML/Makefile +++ b/cpp/src/IceXML/Makefile @@ -8,9 +8,9 @@ # ********************************************************************** top_srcdir = ../.. - + LIBFILENAME = $(call mklibfilename,IceXML,$(VERSION)) -SONAME = $(call mksoname,IceXML,$(SOVERSION)) +SONAME = $(call mksoname,IceXML,$(SOVERSION)) LIBNAME = $(call mklibname,IceXML) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 328a3f9a9bb..9ec88f5786b 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir = ..\.. - + LIBNAME = $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib DLLNAME = $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 56178276555..e99d90d50b5 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -13,49 +13,49 @@ include $(top_srcdir)/config/Make.rules ifneq ($(findstring MINGW,$(UNAME)),) SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - slice2rb \ - Ice \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery + Slice \ + slice2cpp \ + slice2rb \ + Ice \ + IceSSL \ + IceDiscovery \ + IceLocatorDiscovery else SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - slice2cs \ - slice2freeze \ - slice2freezej \ - slice2java \ - slice2php \ - slice2py \ - slice2rb \ - slice2html \ - slice2js + Slice \ + slice2cpp \ + slice2cs \ + slice2freeze \ + slice2freezej \ + slice2java \ + slice2php \ + slice2py \ + slice2rb \ + slice2html \ + slice2js ifeq ($(UNAME),Darwin) - SUBDIRS := $(SUBDIRS) slice2objc + SUBDIRS := $(SUBDIRS) slice2objc endif - SUBDIRS := $(SUBDIRS) \ - Ice \ - IceXML \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery \ - Freeze \ - FreezeScript \ - IceBox \ - Glacier2Lib \ - Glacier2CryptPermissionsVerifier \ - Glacier2 \ - IcePatch2Lib \ - IcePatch2 \ - IceStormLib \ - IceGridLib \ - IceStorm \ - IceGrid + SUBDIRS := $(SUBDIRS) \ + Ice \ + IceXML \ + IceSSL \ + IceDiscovery \ + IceLocatorDiscovery \ + Freeze \ + FreezeScript \ + IceBox \ + Glacier2Lib \ + Glacier2CryptPermissionsVerifier \ + Glacier2 \ + IcePatch2Lib \ + IcePatch2 \ + IceStormLib \ + IceGridLib \ + IceStorm \ + IceGrid endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/Glacier2/attack/Makefile b/cpp/test/Glacier2/attack/Makefile index f2a53dfb235..4963f97a9db 100644 --- a/cpp/test/Glacier2/attack/Makefile +++ b/cpp/test/Glacier2/attack/Makefile @@ -12,9 +12,9 @@ top_srcdir = ../../.. CLIENT = client SERVER = server -TARGETS = $(CLIENT) $(SERVER) +TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Backend.o +SLICE_OBJS = Backend.o COBJS = $(SLICE_OBJS) \ BackendI.o \ diff --git a/cpp/test/Glacier2/override/Makefile b/cpp/test/Glacier2/override/Makefile index 9d700f85036..57c4f07b4b7 100644 --- a/cpp/test/Glacier2/override/Makefile +++ b/cpp/test/Glacier2/override/Makefile @@ -14,7 +14,7 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Callback.o +SLICE_OBJS = Callback.o COBJS = $(SLICE_OBJS) \ CallbackI.o \ diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index 37b00f4c76f..3735e180ff7 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -52,7 +52,7 @@ SUBDIRS = proxy \ echo \ logger \ networkProxy \ - services + services .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/Ice/background/Makefile.mak b/cpp/test/Ice/background/Makefile.mak index 47da558ee77..01b9940f29a 100644 --- a/cpp/test/Ice/background/Makefile.mak +++ b/cpp/test/Ice/background/Makefile.mak @@ -16,7 +16,6 @@ DLLNAME = testtransport$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME) - SLICE_OBJS = .\Test.obj COBJS = $(SLICE_OBJS) \ diff --git a/cpp/test/Ice/custom/Makefile.mak b/cpp/test/Ice/custom/Makefile.mak index 350c5cfd611..eb5ee807e4a 100644 --- a/cpp/test/Ice/custom/Makefile.mak +++ b/cpp/test/Ice/custom/Makefile.mak @@ -16,7 +16,6 @@ COLLOCATED = collocated.exe TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - SLICE_OBJS = .\Test.obj \ .\TestAMD.obj \ .\Wstring.obj \ @@ -27,7 +26,7 @@ COBJS = .\Test.obj \ .\Client.obj \ .\AllTests.obj \ .\MyByteSeq.obj \ - .\StringConverterI.obj + .\StringConverterI.obj SOBJS = .\Test.obj \ .\Wstring.obj \ diff --git a/cpp/test/Ice/dispatcher/Makefile b/cpp/test/Ice/dispatcher/Makefile index a5476266e78..d60583058c8 100644 --- a/cpp/test/Ice/dispatcher/Makefile +++ b/cpp/test/Ice/dispatcher/Makefile @@ -15,7 +15,7 @@ COLLOCATED = $(call mktestname,collocated) TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) -SLICE_OBJS = Test.o +SLICE_OBJS = Test.o COBJS = $(SLICE_OBJS) \ Dispatcher.o \ diff --git a/cpp/test/Ice/logger/Makefile b/cpp/test/Ice/logger/Makefile index 46f0ac41542..8c337fa6a76 100644 --- a/cpp/test/Ice/logger/Makefile +++ b/cpp/test/Ice/logger/Makefile @@ -35,15 +35,15 @@ LINKWITH := $(LIBS) $(ICONV_LIBS) $(CLIENT1): $(C1OBJS) rm -f $@ $(call mktest,$@,$(C1OBJS),$(LINKWITH)) - + $(CLIENT2): $(C2OBJS) rm -f $@ $(call mktest,$@,$(C2OBJS),$(LINKWITH)) - + $(CLIENT3): $(C3OBJS) rm -f $@ $(call mktest,$@,$(C3OBJS),$(LINKWITH)) - + $(CLIENT4): $(C4OBJS) rm -f $@ $(call mktest,$@,$(C4OBJS),$(LINKWITH)) diff --git a/cpp/test/Ice/logger/Makefile.mak b/cpp/test/Ice/logger/Makefile.mak index f8b2389dd6e..91f7cd961ef 100644 --- a/cpp/test/Ice/logger/Makefile.mak +++ b/cpp/test/Ice/logger/Makefile.mak @@ -41,12 +41,12 @@ $(CLIENT1): $(C1OBJS) $(LINK) $(LD_EXEFLAGS) $(C1PDBFLAGS) $(SETARGV) $(C1OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - + $(CLIENT2): $(C2OBJS) $(LINK) $(LD_EXEFLAGS) $(C2PDBFLAGS) $(SETARGV) $(C2OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - + $(CLIENT3): $(C3OBJS) $(LINK) $(LD_EXEFLAGS) $(C3PDBFLAGS) $(SETARGV) $(C3OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ diff --git a/cpp/test/Ice/services/Makefile b/cpp/test/Ice/services/Makefile index 0c868574cb0..2ba8bae1c90 100644 --- a/cpp/test/Ice/services/Makefile +++ b/cpp/test/Ice/services/Makefile @@ -16,8 +16,8 @@ TARGETS = $(CLIENT) SLICE_OBJS = Test.o COBJS = Client.o \ - AllTests.o \ - $(SLICE_OBJS) + AllTests.o \ + $(SLICE_OBJS) OBJS = $(COBJS) diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mak b/cpp/test/Ice/slicing/exceptions/Makefile.mak index cb23e300c0f..78ee9040d09 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mak +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mak @@ -27,7 +27,7 @@ COBJS = .\Test.obj \ .\AllTests.obj SOBJS = .\Test.obj \ - .\ServerPrivate.obj \ + .\ServerPrivate.obj \ .\TestI.obj \ .\Server.obj diff --git a/cpp/test/Ice/udp/Makefile b/cpp/test/Ice/udp/Makefile index a9fd3f02983..0040afbe7ea 100644 --- a/cpp/test/Ice/udp/Makefile +++ b/cpp/test/Ice/udp/Makefile @@ -14,7 +14,7 @@ SERVER = $(call mktestname,server) TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Test.o +SLICE_OBJS = Test.o COBJS = $(SLICE_OBJS) \ Client.o \ diff --git a/cpp/test/IceBox/Makefile b/cpp/test/IceBox/Makefile index 933495f42fd..044d8eb633b 100644 --- a/cpp/test/IceBox/Makefile +++ b/cpp/test/IceBox/Makefile @@ -11,7 +11,6 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules - SUBDIRS = admin configuration .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/IceDiscovery/Makefile b/cpp/test/IceDiscovery/Makefile index b97a2d813ae..696e1683906 100644 --- a/cpp/test/IceDiscovery/Makefile +++ b/cpp/test/IceDiscovery/Makefile @@ -11,10 +11,8 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules - SUBDIRS = simple - .PHONY: $(EVERYTHING) $(SUBDIRS) all:: $(SUBDIRS) diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile index 93816140bfb..0040afbe7ea 100644 --- a/cpp/test/IceDiscovery/simple/Makefile +++ b/cpp/test/IceDiscovery/simple/Makefile @@ -14,7 +14,7 @@ SERVER = $(call mktestname,server) TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Test.o \ +SLICE_OBJS = Test.o COBJS = $(SLICE_OBJS) \ Client.o \ diff --git a/cpp/test/IceGrid/Makefile b/cpp/test/IceGrid/Makefile index 70122bc3f64..5e0c8c71d4b 100644 --- a/cpp/test/IceGrid/Makefile +++ b/cpp/test/IceGrid/Makefile @@ -11,7 +11,6 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules - SUBDIRS = simple \ deployer \ session \ diff --git a/cpp/test/IceGrid/Makefile.mak b/cpp/test/IceGrid/Makefile.mak index 0fc174193aa..9c61f91ae43 100644 --- a/cpp/test/IceGrid/Makefile.mak +++ b/cpp/test/IceGrid/Makefile.mak @@ -13,17 +13,17 @@ top_srcdir = ..\.. SUBDIRS = activation \ - admin \ - allocation \ - deployer \ - distribution \ - fileLock \ - noRestartUpdate \ - replicaGroup \ - replication \ - session \ - simple \ - update + admin \ + allocation \ + deployer \ + distribution \ + fileLock \ + noRestartUpdate \ + replicaGroup \ + replication \ + session \ + simple \ + update $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/cpp/test/IceGrid/activation/Makefile b/cpp/test/IceGrid/activation/Makefile index 464acf6d169..91f532796b7 100644 --- a/cpp/test/IceGrid/activation/Makefile +++ b/cpp/test/IceGrid/activation/Makefile @@ -14,7 +14,7 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -SLICE_OBJS = Test.o \ +SLICE_OBJS = Test.o COBJS = $(SLICE_OBJS) \ Client.o \ diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak index c265a3b2c3c..c8ff99b1fbb 100644 --- a/cpp/test/IceGrid/simple/Makefile.mak +++ b/cpp/test/IceGrid/simple/Makefile.mak @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = .\Test.obj -COBJS = $(SLICE_OBJS) \ +COBJS = $(SLICE_OBJS) \ .\Client.obj \ .\AllTests.obj @@ -30,7 +30,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) +LINKWITH = $(LIBS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) @@ -50,8 +50,8 @@ $(SERVER): $(SOBJS) clean:: del /q build.txt del /q Test.cpp Test.h - if exist db\node rmdir /s /q db\node - if exist db\registry rmdir /s /q db\registry + if exist db\node rmdir /s /q db\node + if exist db\registry rmdir /s /q db\registry if exist db\replica-1 rmdir /s /q db\replica-1 !if "$(OPTIMIZE)" == "yes" @@ -64,4 +64,4 @@ all:: all:: @echo debug > build.txt -!endif
\ No newline at end of file +!endif diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index fefa1c50517..25cf6c4c957 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -14,7 +14,7 @@ SUBSCRIBER = subscriber.exe TARGETS = $(PUBLISHER) $(SUBSCRIBER) -SLICE_OBJS = .\Event.obj +SLICE_OBJS = .\Event.obj POBJS = $(SLICE_OBJS) \ .\Publisher.obj diff --git a/cpp/test/IceUtil/condvar/Makefile b/cpp/test/IceUtil/condvar/Makefile index b88bc76cf92..ba607481881 100644 --- a/cpp/test/IceUtil/condvar/Makefile +++ b/cpp/test/IceUtil/condvar/Makefile @@ -16,6 +16,7 @@ TARGETS = $(WQ) $(MATCH) OBJS = WorkQueue.o \ Match.o + include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) diff --git a/csharp/Makefile b/csharp/Makefile index d20e336353e..d779461fb58 100644 --- a/csharp/Makefile +++ b/csharp/Makefile @@ -45,8 +45,6 @@ install:: install-common endif - - $(EVERYTHING):: @for subdir in $(SUBDIRS); \ do \ diff --git a/csharp/config/Make.rules.cs b/csharp/config/Make.rules.cs index a34c5401134..b4757dd8ef4 100644 --- a/csharp/config/Make.rules.cs +++ b/csharp/config/Make.rules.cs @@ -84,9 +84,9 @@ DSEP = / bindir = $(top_srcdir)/bin -assembliesdir = $(top_srcdir)/Assemblies +assembliesdir = $(top_srcdir)/Assemblies -install_bindir = $(prefix)/bin +install_bindir = $(prefix)/bin ifeq ($(GACINSTALL),yes) ifeq ($(GAC_ROOT),) @@ -143,9 +143,9 @@ ifeq ($(GACINSTALL),yes) endif else installassembly = $(INSTALL_LIBRARY) $(1) $(DESTDIR)$(install_assembliesdir); \ - chmod a+rx $(DESTDIR)$(install_assembliesdir)/$(notdir $(1)) + chmod a+rx $(DESTDIR)$(install_assembliesdir)/$(notdir $(1)) installpolicy = $(INSTALL_LIBRARY) $(1).dll $(install_assembliesdir); \ - chmod a+rx $(install_assembliesdir)/$(notdir $(1).dll) + chmod a+rx $(install_assembliesdir)/$(notdir $(1).dll) ifeq ($(DEBUG),yes) installmdb = $(INSTALL_LIBRARY) $(1) $(DESTDIR)$(install_assembliesdir); \ chmod a+rx $(DESTDIR)$(install_assembliesdir)/$(notdir $(1)) @@ -182,11 +182,11 @@ ifeq ($(UNITY),yes) endif ifdef ice_src_dist - SLICE2CS = $(ice_cpp_dir)/$(binsubdir)/slice2cs - SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICE2CS = $(ice_cpp_dir)/$(binsubdir)/slice2cs + SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) else - SLICE2CS = $(ice_dir)/$(binsubdir)/slice2cs - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICE2CS = $(ice_dir)/$(binsubdir)/slice2cs + SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) endif AL = al @@ -241,7 +241,6 @@ SGEN_SRCS = $(subst .ice,.cs,$(addprefix $(GDIR)/,$(notdir $(SLICE_S_SRCS)))) GEN_AMD_SRCS = $(subst .ice,.cs,$(addprefix $(GDIR)/,$(notdir $(SLICE_AMD_SRCS)))) SAMD_GEN_SRCS = $(subst .ice,.cs,$(addprefix $(GDIR)/,$(notdir $(SLICE_SAMD_SRCS)))) - EVERYTHING = all depend clean install .SUFFIXES: diff --git a/csharp/config/Make.rules.mak.cs b/csharp/config/Make.rules.mak.cs index e06f72cdb91..e9e89df84c7 100644 --- a/csharp/config/Make.rules.mak.cs +++ b/csharp/config/Make.rules.mak.cs @@ -54,7 +54,7 @@ DEBUG = yes # Define FRAMEWORK as 3.5 to force a .NET 3.5 build with Visual Studio 2010. # -#FRAMEWORK = 3.5 +#FRAMEWORK = 3.5 # # Set the key file used to sign assemblies. @@ -86,7 +86,7 @@ assembliesdir = $(top_srcdir)\Assemblies install_bindir = $(prefix)\bin install_assembliesdir = $(prefix)\Assemblies install_configdir = $(prefix)\config -install_libdir = $(prefix)\lib +install_libdir = $(prefix)\lib !if "$(ice_src_dist)" != "" refdir = $(assembliesdir) @@ -98,13 +98,13 @@ refdir = $(ice_dir)\Assemblies generate_policies = yes !endif -MCS = csc -nologo +MCS = csc -nologo # # UNITY implies MANAGED. # !if "$(UNITY)" == "yes" -MANAGED = yes +MANAGED = yes !endif MCSFLAGS = -warnaserror diff --git a/csharp/src/Glacier2/Makefile b/csharp/src/Glacier2/Makefile index e54132c9f6f..fb9f5e74e10 100644 --- a/csharp/src/Glacier2/Makefile +++ b/csharp/src/Glacier2/Makefile @@ -20,7 +20,7 @@ SRCS = Application.cs \ SessionFactoryHelper.cs \ SessionHelper.cs -SLICE_SRCS = $(SDIR)/Metrics.ice \ +SLICE_SRCS = $(SDIR)/Metrics.ice \ $(SDIR)/PermissionsVerifier.ice \ $(SDIR)/Router.ice \ $(SDIR)/Session.ice \ diff --git a/csharp/test/Ice/Makefile b/csharp/test/Ice/Makefile index d924ed07e90..1e6e102fc1f 100644 --- a/csharp/test/Ice/Makefile +++ b/csharp/test/Ice/Makefile @@ -26,7 +26,7 @@ SUBDIRS = application \ objects \ binding \ proxy \ - properties \ + properties \ operations \ ami \ dispatcher \ diff --git a/csharp/test/Ice/echo/Makefile.mak b/csharp/test/Ice/echo/Makefile.mak index 0fd24cfaf8a..35ae81e0b42 100644 --- a/csharp/test/Ice/echo/Makefile.mak +++ b/csharp/test/Ice/echo/Makefile.mak @@ -15,9 +15,9 @@ S_SRCS = Server.cs BlobjectI.cs GEN_SRCS = $(GDIR)\Test.cs -SDIR = . +SDIR = . -GDIR = generated +GDIR = generated !include $(top_srcdir)\config\Make.rules.mak.cs diff --git a/csharp/test/Ice/plugin/Makefile b/csharp/test/Ice/plugin/Makefile index 24eb434f446..ff2669f8d2f 100644 --- a/csharp/test/Ice/plugin/Makefile +++ b/csharp/test/Ice/plugin/Makefile @@ -14,16 +14,16 @@ TARGETS = client.exe plugins/Plugin.dll C_SRCS = Client.cs P_SRCS = BasePlugin.cs \ - PluginFactory.cs \ - PluginInitializeFailException.cs \ - BasePluginFail.cs \ - PluginInitializeFailFactory.cs \ - PluginOneFactory.cs \ - PluginOneFailFactory.cs \ - PluginThreeFactory.cs \ - PluginThreeFailFactory.cs \ - PluginTwoFactory.cs \ - PluginTwoFailFactory.cs + PluginFactory.cs \ + PluginInitializeFailException.cs \ + BasePluginFail.cs \ + PluginInitializeFailFactory.cs \ + PluginOneFactory.cs \ + PluginOneFailFactory.cs \ + PluginThreeFactory.cs \ + PluginThreeFailFactory.cs \ + PluginTwoFactory.cs \ + PluginTwoFailFactory.cs SDIR = . diff --git a/js/Makefile.mak b/js/Makefile.mak index 9b38cb643e2..853ff0135c3 100644 --- a/js/Makefile.mak +++ b/js/Makefile.mak @@ -22,7 +22,7 @@ clean: npminstall install:: npminstall $(NPM) run gulp:install - + lint:: npminstall $(NPM) run gulp:lint @@ -30,4 +30,4 @@ test: @python .\allTests.py npminstall: - $(NPM) install
\ No newline at end of file + $(NPM) install diff --git a/objective-c/Makefile b/objective-c/Makefile index 184244a64c7..459660ede9e 100644 --- a/objective-c/Makefile +++ b/objective-c/Makefile @@ -14,7 +14,7 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = src include ifneq ($(MAKECMDGOALS),install) - SUBDIRS := $(SUBDIRS) test + SUBDIRS := $(SUBDIRS) test endif INSTALL_SUBDIRS = $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index d45a43a1f13..01724d1681c 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -37,7 +37,7 @@ create_runpath_symlink ?= no # Define embedded_runpath as no if you don't want any RPATH added to # the executables. # -embedded_runpath ?= yes +embedded_runpath ?= yes # # The build architectures for gcc/llvm based builds. The format of @@ -46,7 +46,7 @@ embedded_runpath ?= yes # "-arch i386 -arch x86_64". The default is OS version dependent. Be # aware that this value may conflict with the setting of LP64 above. # -#OBJCARCHFLAGS = -arch i386 -arch x86_64 +#OBJCARCHFLAGS = -arch i386 -arch x86_64 # ---------------------------------------------------------------------- # Don't change anything below this line! diff --git a/objective-c/config/Make.rules.Darwin b/objective-c/config/Make.rules.Darwin index 52df269c2b8..faeabc71022 100644 --- a/objective-c/config/Make.rules.Darwin +++ b/objective-c/config/Make.rules.Darwin @@ -13,24 +13,23 @@ OSX_TARGET_MIN_SDK_VERSION = 10.9 -CC = xcrun clang -CXX = xcrun clang++ - -CPPFLAGS += -pthread -fvisibility=hidden -OBJCFLAGS += -Wall -Werror -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION) +CC = xcrun clang +CXX = xcrun clang++ +CPPFLAGS += -pthread -fvisibility=hidden +OBJCFLAGS += -Wall -Werror -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION) # # By default we build x86_64 binaries. # ifeq ($(OBJCARCHFLAGS),) -OBJCARCHFLAGS := -arch x86_64 +OBJCARCHFLAGS := -arch x86_64 endif ifeq ($(OPTIMIZE),yes) - OBJCFLAGS := $(OBJCARCHFLAGS) -O2 -DNDEBUG $(OBJCFLAGS) + OBJCFLAGS := $(OBJCARCHFLAGS) -O2 -DNDEBUG $(OBJCFLAGS) else - OBJCFLAGS := $(OBJCARCHFLAGS) -g $(OBJCFLAGS) + OBJCFLAGS := $(OBJCARCHFLAGS) -g $(OBJCFLAGS) endif # @@ -71,7 +70,7 @@ ifeq ($(embedded_runpath),yes) endif ifdef ice_src_dist -rpathlink = -Wl,-rpath,$(1) +rpathlink = -Wl,-rpath,$(1) endif # @@ -79,11 +78,11 @@ endif # when COMPILE_WITH_ARC is defined. # ifneq ($(findstring demo/,${CURDIR}),) -TARGET_SUPPORT_ARC = yes +TARGET_SUPPORT_ARC = yes endif ifneq ($(findstring test/,${CURDIR}),) -TARGET_SUPPORT_ARC = yes +TARGET_SUPPORT_ARC = yes endif ifeq ($(TARGET_SUPPORT_ARC),yes) @@ -101,5 +100,5 @@ mkshlib = $(CXX) -dynamiclib $(LDFLAGS) -o $(1) -install_name @rpath/$(2) $(3) BASELIBS = -L$(ice_cpp_dir)/$(libsubdir) -lIce -lIceUtil -framework Foundation LIBS = -lIceObjC$(libsuffix) -framework Foundation -ICESSL_LIBS = -lIceSSLObjC$(libsuffix) +ICESSL_LIBS = -lIceSSLObjC$(libsuffix) TEST_LIBS = -lTestCommon $(LIBS) diff --git a/objective-c/src/Glacier2/Makefile b/objective-c/src/Glacier2/Makefile index dd942e510f2..e9e67bc09d1 100644 --- a/objective-c/src/Glacier2/Makefile +++ b/objective-c/src/Glacier2/Makefile @@ -15,13 +15,13 @@ LIBNAME = $(call mklibname,Glacier2ObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -SLICE_OBJS = Metrics.o \ - PermissionsVerifierF.o \ - PermissionsVerifier.o \ - Router.o \ - RouterF.o \ - Session.o \ - SSLInfo.o +SLICE_OBJS = Metrics.o \ + PermissionsVerifierF.o \ + PermissionsVerifier.o \ + Router.o \ + RouterF.o \ + Session.o \ + SSLInfo.o OBJS = $(SLICE_OBJS) diff --git a/objective-c/src/Ice/Makefile b/objective-c/src/Ice/Makefile index 5e61fb797a5..50fd9aa6425 100644 --- a/objective-c/src/Ice/Makefile +++ b/objective-c/src/Ice/Makefile @@ -16,66 +16,66 @@ LIBNAME = $(call mklibname,IceObjC$(libsuffix)) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = BuiltinSequences.o \ - Communicator.o \ - CommunicatorF.o \ - Connection.o \ - ConnectionF.o \ - Current.o \ - Endpoint.o \ - EndpointF.o \ - EndpointTypes.o \ - FacetMap.o \ - Identity.o \ - InstrumentationF.o \ - ImplicitContext.o \ - ImplicitContextF.o \ - Locator.o \ - LocatorF.o \ - LocalException.o \ - Logger.o \ - LoggerF.o \ - Metrics.o \ - ObjectAdapter.o \ - ObjectAdapterF.o \ - ObjectFactoryF.o \ - PluginF.o \ - Process.o \ - ProcessF.o \ - Properties.o \ - PropertiesF.o \ - PropertiesAdmin.o \ - RemoteLogger.o \ - Router.o \ - RouterF.o \ - ServantLocator.o \ - ServantLocatorF.o \ - SliceChecksumDict.o \ - Version.o + Communicator.o \ + CommunicatorF.o \ + Connection.o \ + ConnectionF.o \ + Current.o \ + Endpoint.o \ + EndpointF.o \ + EndpointTypes.o \ + FacetMap.o \ + Identity.o \ + InstrumentationF.o \ + ImplicitContext.o \ + ImplicitContextF.o \ + Locator.o \ + LocatorF.o \ + LocalException.o \ + Logger.o \ + LoggerF.o \ + Metrics.o \ + ObjectAdapter.o \ + ObjectAdapterF.o \ + ObjectFactoryF.o \ + PluginF.o \ + Process.o \ + ProcessF.o \ + Properties.o \ + PropertiesF.o \ + PropertiesAdmin.o \ + RemoteLogger.o \ + Router.o \ + RouterF.o \ + ServantLocator.o \ + ServantLocatorF.o \ + SliceChecksumDict.o \ + Version.o OBJC_OBJS = DispatchInterceptor.o \ - Request.o \ - $(SLICE_OBJS) + Request.o \ + $(SLICE_OBJS) OBJCXX_OBJS = BatchRequestInterceptor.o \ - CommunicatorI.o \ - ConnectionI.o \ - CurrentI.o \ - EndpointI.o \ - Exception.o \ - Dispatcher.o \ - IdentityI.o \ - ImplicitContextI.o \ - Initialize.o \ - LocalObject.o \ - LoggerI.o \ - Object.o \ - ObjectAdapterI.o \ - PropertiesI.o \ - Proxy.o \ - Stream.o \ - SlicedData.o \ - Util.o \ - VersionI.o + CommunicatorI.o \ + ConnectionI.o \ + CurrentI.o \ + EndpointI.o \ + Exception.o \ + Dispatcher.o \ + IdentityI.o \ + ImplicitContextI.o \ + Initialize.o \ + LocalObject.o \ + LoggerI.o \ + Object.o \ + ObjectAdapterI.o \ + PropertiesI.o \ + Proxy.o \ + Stream.o \ + SlicedData.o \ + Util.o \ + VersionI.o OBJS := $(OBJC_OBJS) $(OBJCXX_OBJS) @@ -84,9 +84,9 @@ SDIR = $(slicedir)/Ice include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. -I$(ice_cpp_dir)/include -DICE_API_EXPORTS $(CPPFLAGS) +CPPFLAGS := -I. -I$(ice_cpp_dir)/include -DICE_API_EXPORTS $(CPPFLAGS) SLICE2OBJCFLAGS := --ice --include-dir objc/Ice --dll-export ICE_API $(SLICE2OBJCFLAGS) -LINKWITH := $(BASELIBS) +LINKWITH := $(BASELIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ diff --git a/objective-c/src/IceGrid/Makefile b/objective-c/src/IceGrid/Makefile index 6aca248fa09..a3b42c83892 100644 --- a/objective-c/src/IceGrid/Makefile +++ b/objective-c/src/IceGrid/Makefile @@ -16,16 +16,16 @@ LIBNAME = $(call mklibname,IceGridObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = Admin.o \ - Descriptor.o \ - Exception.o \ - FileParser.o \ - Locator.o \ - Observer.o \ - PluginFacade.o \ - Query.o \ - Registry.o \ - Session.o \ - UserAccountMapper.o + Descriptor.o \ + Exception.o \ + FileParser.o \ + Locator.o \ + Observer.o \ + PluginFacade.o \ + Query.o \ + Registry.o \ + Session.o \ + UserAccountMapper.o OBJS = $(SLICE_OBJS) diff --git a/objective-c/src/IceSSL/Makefile b/objective-c/src/IceSSL/Makefile index d25103405a1..52682acb491 100644 --- a/objective-c/src/IceSSL/Makefile +++ b/objective-c/src/IceSSL/Makefile @@ -16,10 +16,10 @@ LIBNAME = $(call mklibname,IceSSLObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = EndpointInfo.o \ - ConnectionInfo.o + ConnectionInfo.o OBJCXX_OBJS = EndpointInfoI.o \ - ConnectionInfoI.o + ConnectionInfoI.o OBJS = $(SLICE_OBJS) $(OBJCXX_OBJS) diff --git a/objective-c/src/IceStorm/Makefile b/objective-c/src/IceStorm/Makefile index 1c55d69ffae..9d915e567ba 100644 --- a/objective-c/src/IceStorm/Makefile +++ b/objective-c/src/IceStorm/Makefile @@ -15,8 +15,8 @@ LIBNAME = $(call mklibname,IceStormObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -SLICE_OBJS = Metrics.o \ - IceStorm.o +SLICE_OBJS = Metrics.o \ + IceStorm.o OBJS = $(SLICE_OBJS) diff --git a/objective-c/test/Ice/acm/Makefile b/objective-c/test/Ice/acm/Makefile index ba45e28b131..f0214684507 100644 --- a/objective-c/test/Ice/acm/Makefile +++ b/objective-c/test/Ice/acm/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = ACMTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/adapterDeactivation/Makefile b/objective-c/test/Ice/adapterDeactivation/Makefile index 5c2173a9d94..fe9b313495c 100644 --- a/objective-c/test/Ice/adapterDeactivation/Makefile +++ b/objective-c/test/Ice/adapterDeactivation/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = AdapterDeactivationTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/admin/Makefile b/objective-c/test/Ice/admin/Makefile index af39c7ba045..7238e913c5d 100644 --- a/objective-c/test/Ice/admin/Makefile +++ b/objective-c/test/Ice/admin/Makefile @@ -17,11 +17,11 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = AdminTest.o COBJS = Client.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/ami/Makefile b/objective-c/test/Ice/ami/Makefile index 0667e0e7055..42fd31d0c3f 100644 --- a/objective-c/test/Ice/ami/Makefile +++ b/objective-c/test/Ice/ami/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = AMITest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/binding/Makefile b/objective-c/test/Ice/binding/Makefile index a9da9aad0c7..66967b67222 100644 --- a/objective-c/test/Ice/binding/Makefile +++ b/objective-c/test/Ice/binding/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = BindingTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/defaultServant/Makefile b/objective-c/test/Ice/defaultServant/Makefile index 76982f8e7d8..a8441f0f06f 100644 --- a/objective-c/test/Ice/defaultServant/Makefile +++ b/objective-c/test/Ice/defaultServant/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = DefaultServantTest.o COBJS = Client.o \ - MyObjectI.o + MyObjectI.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/defaultValue/Makefile b/objective-c/test/Ice/defaultValue/Makefile index 0fb65a35f58..2c5f304c231 100644 --- a/objective-c/test/Ice/defaultValue/Makefile +++ b/objective-c/test/Ice/defaultValue/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = DefaultValueTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/dispatcher/Makefile b/objective-c/test/Ice/dispatcher/Makefile index f8da9df04cd..7f7fe89a2a9 100644 --- a/objective-c/test/Ice/dispatcher/Makefile +++ b/objective-c/test/Ice/dispatcher/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = DispatcherTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/enums/Makefile b/objective-c/test/Ice/enums/Makefile index 14ab68894c1..ec3b76e4311 100644 --- a/objective-c/test/Ice/enums/Makefile +++ b/objective-c/test/Ice/enums/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = EnumTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/exceptions/Makefile b/objective-c/test/Ice/exceptions/Makefile index 55f32b2a5c2..2b577282191 100644 --- a/objective-c/test/Ice/exceptions/Makefile +++ b/objective-c/test/Ice/exceptions/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ExceptionsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/facets/Makefile b/objective-c/test/Ice/facets/Makefile index 1ed32b66172..dfe06d39140 100644 --- a/objective-c/test/Ice/facets/Makefile +++ b/objective-c/test/Ice/facets/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = FacetsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/faultTolerance/Makefile b/objective-c/test/Ice/faultTolerance/Makefile index 35a7af4753e..91bb733fc39 100644 --- a/objective-c/test/Ice/faultTolerance/Makefile +++ b/objective-c/test/Ice/faultTolerance/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = FaultToleranceTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/hash/Makefile b/objective-c/test/Ice/hash/Makefile index 36e3431b261..37a6ad744cf 100644 --- a/objective-c/test/Ice/hash/Makefile +++ b/objective-c/test/Ice/hash/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = HashTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/hold/Makefile b/objective-c/test/Ice/hold/Makefile index c3a2e3766ea..95c00f56796 100644 --- a/objective-c/test/Ice/hold/Makefile +++ b/objective-c/test/Ice/hold/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = HoldTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/info/Makefile b/objective-c/test/Ice/info/Makefile index 5c5a231ecc6..18309076c93 100644 --- a/objective-c/test/Ice/info/Makefile +++ b/objective-c/test/Ice/info/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = InfoTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/inheritance/Makefile b/objective-c/test/Ice/inheritance/Makefile index 19c3ee7806a..f5d5cf5434c 100644 --- a/objective-c/test/Ice/inheritance/Makefile +++ b/objective-c/test/Ice/inheritance/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = InheritanceTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/interceptor/Makefile b/objective-c/test/Ice/interceptor/Makefile index 5b75eed1931..07caf565409 100644 --- a/objective-c/test/Ice/interceptor/Makefile +++ b/objective-c/test/Ice/interceptor/Makefile @@ -16,8 +16,8 @@ TARGETS = $(CLIENT) SLICE_OBJS = InterceptorTest.o COBJS = Client.o \ - InterceptorI.o \ - MyObjectI.o \ + InterceptorI.o \ + MyObjectI.o \ OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/invoke/Makefile b/objective-c/test/Ice/invoke/Makefile index 4131daa6bf3..b08e9fefd35 100644 --- a/objective-c/test/Ice/invoke/Makefile +++ b/objective-c/test/Ice/invoke/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = InvokeTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = BlobjectI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/location/Makefile b/objective-c/test/Ice/location/Makefile index aedb3040ca3..f7b2fce927b 100644 --- a/objective-c/test/Ice/location/Makefile +++ b/objective-c/test/Ice/location/Makefile @@ -17,11 +17,11 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = LocationTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - ServerLocator.o \ - Server.o + ServerLocator.o \ + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/metrics/Makefile b/objective-c/test/Ice/metrics/Makefile index 4903fcb6485..e169cf218b1 100644 --- a/objective-c/test/Ice/metrics/Makefile +++ b/objective-c/test/Ice/metrics/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = MetricsTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/objects/Makefile b/objective-c/test/Ice/objects/Makefile index 6dbc4fdb29d..91beb498cb8 100644 --- a/objective-c/test/Ice/objects/Makefile +++ b/objective-c/test/Ice/objects/Makefile @@ -18,15 +18,15 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ObjectsTest.o COBJS = Client.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/operations/Makefile b/objective-c/test/Ice/operations/Makefile index 3bab9f10ded..c9e41667385 100644 --- a/objective-c/test/Ice/operations/Makefile +++ b/objective-c/test/Ice/operations/Makefile @@ -18,31 +18,31 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = OperationsTest.o COBJS = Client.o \ - AllTests.o \ + AllTests.o \ Twoways.o \ - TwowaysNewAMI.o \ - Oneways.o \ - OnewaysNewAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o + TwowaysNewAMI.o \ + Oneways.o \ + OnewaysNewAMI.o \ + BatchOneways.o \ + BatchOnewaysAMI.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o \ + TestI.o \ + AllTests.o \ Twoways.o \ - TwowaysNewAMI.o \ - Oneways.o \ - OnewaysNewAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o + TwowaysNewAMI.o \ + Oneways.o \ + OnewaysNewAMI.o \ + BatchOneways.o \ + BatchOnewaysAMI.o OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) \ - $(SLICE_OBJS) + $(SOBJS) \ + $(COLOBJS) \ + $(SLICE_OBJS) include $(top_srcdir)/config/Make.rules diff --git a/objective-c/test/Ice/optional/Makefile b/objective-c/test/Ice/optional/Makefile index 0a40f34414b..dc8be04230a 100644 --- a/objective-c/test/Ice/optional/Makefile +++ b/objective-c/test/Ice/optional/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = OptionalTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/proxy/Makefile b/objective-c/test/Ice/proxy/Makefile index 1ecb047ee9e..ac7a3934ca2 100644 --- a/objective-c/test/Ice/proxy/Makefile +++ b/objective-c/test/Ice/proxy/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ProxyTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/retry/Makefile b/objective-c/test/Ice/retry/Makefile index f96056146bc..e211cdec369 100644 --- a/objective-c/test/Ice/retry/Makefile +++ b/objective-c/test/Ice/retry/Makefile @@ -18,14 +18,14 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = RetryTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o COLOBJS = Collocated.o \ - TestI.o \ - AllTests.o + TestI.o \ + AllTests.o OBJS = $(COBJS) $(SOBJS) $(COLOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/servantLocator/Makefile b/objective-c/test/Ice/servantLocator/Makefile index 0a0fdea6eed..bef117e91ae 100644 --- a/objective-c/test/Ice/servantLocator/Makefile +++ b/objective-c/test/Ice/servantLocator/Makefile @@ -18,16 +18,16 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) SLICE_OBJS = ServantLocatorTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - ServantLocatorI.o \ - Server.o + ServantLocatorI.o \ + Server.o COLOBJS = TestI.o \ - ServantLocatorI.o \ - AllTests.o \ - Collocated.o + ServantLocatorI.o \ + AllTests.o \ + Collocated.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/services/Makefile b/objective-c/test/Ice/services/Makefile index ced9094f279..0a159c4515d 100644 --- a/objective-c/test/Ice/services/Makefile +++ b/objective-c/test/Ice/services/Makefile @@ -16,7 +16,7 @@ TARGETS = $(CLIENT) SLICE_OBJS = ServicesTest.o COBJS = Client.o \ - AllTests.o + AllTests.o OBJS = $(COBJS) $(SLICE_OBJS) diff --git a/objective-c/test/Ice/slicing/exceptions/Makefile b/objective-c/test/Ice/slicing/exceptions/Makefile index b67fcc04b3c..51974dc089c 100644 --- a/objective-c/test/Ice/slicing/exceptions/Makefile +++ b/objective-c/test/Ice/slicing/exceptions/Makefile @@ -15,15 +15,15 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = SlicingExceptionsTestClient.o \ - SlicingExceptionsTestServer.o + SlicingExceptionsTestServer.o COBJS = Client.o \ - AllTests.o \ - SlicingExceptionsTestClient.o + AllTests.o \ + SlicingExceptionsTestClient.o SOBJS = TestI.o \ - Server.o \ - SlicingExceptionsTestServer.o + Server.o \ + SlicingExceptionsTestServer.o OBJS = $(COBJS) $(SOBJS) diff --git a/objective-c/test/Ice/slicing/objects/Makefile b/objective-c/test/Ice/slicing/objects/Makefile index 4a2a8876ab2..b7d9bd94d1b 100644 --- a/objective-c/test/Ice/slicing/objects/Makefile +++ b/objective-c/test/Ice/slicing/objects/Makefile @@ -15,19 +15,19 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = SlicingObjectsTestClient.o \ - SlicingObjectsForwardClient.o \ - SlicingObjectsTestServer.o \ - SlicingObjectsForwardServer.o + SlicingObjectsForwardClient.o \ + SlicingObjectsTestServer.o \ + SlicingObjectsForwardServer.o COBJS = SlicingObjectsTestClient.o \ - SlicingObjectsForwardClient.o \ - Client.o \ - AllTests.o + SlicingObjectsForwardClient.o \ + Client.o \ + AllTests.o SOBJS = SlicingObjectsTestServer.o \ - SlicingObjectsForwardServer.o \ - TestI.o \ - Server.o + SlicingObjectsForwardServer.o \ + TestI.o \ + Server.o OBJS = $(COBJS) $(SOBJS) diff --git a/objective-c/test/Ice/timeout/Makefile b/objective-c/test/Ice/timeout/Makefile index 9e6ba54dad3..62d0fdaa9d4 100644 --- a/objective-c/test/Ice/timeout/Makefile +++ b/objective-c/test/Ice/timeout/Makefile @@ -17,10 +17,10 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_OBJS = TimeoutTest.o COBJS = Client.o \ - AllTests.o + AllTests.o SOBJS = TestI.o \ - Server.o + Server.o OBJS = $(COBJS) $(SOBJS) $(SLICE_OBJS) diff --git a/php/config/Make.rules.mak.php b/php/config/Make.rules.mak.php index a7d0165e7c1..1d8316e817d 100644 --- a/php/config/Make.rules.mak.php +++ b/php/config/Make.rules.mak.php @@ -25,7 +25,7 @@ OPTIMIZE = yes # Specify your C++ compiler. The only value currently supported to # build IcePHP is VC110. Leave unset for auto-detection. # -#CPP_COMPILER = VCxxx +#CPP_COMPILER = VCxxx # # Determines whether the extension uses PHP namespaces (requires @@ -87,9 +87,9 @@ slice_translator = slice2php.exe !include $(top_srcdir)\config\Make.common.rules.mak !endif -libdir = $(top_srcdir)\lib -install_phpdir = $(prefix)\php -install_libdir = $(prefix)\php +libdir = $(top_srcdir)\lib +install_phpdir = $(prefix)\php +install_libdir = $(prefix)\php !if exist ($(top_srcdir)\..\cpp\config\Make.rules.msvc) !include $(top_srcdir)\..\cpp\config\Make.rules.msvc @@ -107,75 +107,75 @@ RCFLAGS = -D_DEBUG # # Import libraries are located automatically # -ICE_LIBS = +ICE_LIBS = !if "$(ice_src_dist)" != "" -ICE_CPPFLAGS = -I"$(ice_cpp_dir)\include" +ICE_CPPFLAGS = -I"$(ice_cpp_dir)\include" !if "$(ice_cpp_dir)" == "$(ice_dir)\cpp" -ICE_LDFLAGS = /LIBPATH:"$(ice_cpp_dir)\lib" +ICE_LDFLAGS = /LIBPATH:"$(ice_cpp_dir)\lib" !else -ICE_LDFLAGS = /LIBPATH:"$(ice_cpp_dir)\lib$(libsuff)" +ICE_LDFLAGS = /LIBPATH:"$(ice_cpp_dir)\lib$(libsuff)" !endif !else -ICE_CPPFLAGS = -I"$(ice_dir)\include" -ICE_LDFLAGS = /LIBPATH:"$(ice_dir)\lib$(libsuff)" +ICE_CPPFLAGS = -I"$(ice_dir)\include" +ICE_LDFLAGS = /LIBPATH:"$(ice_dir)\lib$(libsuff)" !endif -slicedir = $(ice_dir)\slice +slicedir = $(ice_dir)\slice !if "$(PHP_ZTS)" == "yes" -PHP_LIB_PREFIX = php5ts +PHP_LIB_PREFIX = php5ts !else -PHP_LIB_PREFIX = php5 +PHP_LIB_PREFIX = php5 !endif !if "$(OPTIMIZE)" != "yes" -PHP_LDFLAGS = /LIBPATH:"$(PHP_BIN_HOME)" -PHP_LIBS = $(PHP_LIB_PREFIX)_debug.lib -PHP_ZEND_DEBUG = 1 +PHP_LDFLAGS = /LIBPATH:"$(PHP_BIN_HOME)" +PHP_LIBS = $(PHP_LIB_PREFIX)_debug.lib +PHP_ZEND_DEBUG = 1 !else -PHP_LDFLAGS = /LIBPATH:"$(PHP_BIN_HOME)\dev" -PHP_LIBS = $(PHP_LIB_PREFIX).lib -PHP_ZEND_DEBUG = 0 +PHP_LDFLAGS = /LIBPATH:"$(PHP_BIN_HOME)\dev" +PHP_LIBS = $(PHP_LIB_PREFIX).lib +PHP_ZEND_DEBUG = 0 !endif -PHP_CPPFLAGS = -I"$(PHP_HOME)" -I"$(PHP_HOME)\main" -I"$(PHP_HOME)\TSRM" -I"$(PHP_HOME)\Zend" -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=$(PHP_ZEND_DEBUG) -DWIN32 +PHP_CPPFLAGS = -I"$(PHP_HOME)" -I"$(PHP_HOME)\main" -I"$(PHP_HOME)\TSRM" -I"$(PHP_HOME)\Zend" -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=$(PHP_ZEND_DEBUG) -DWIN32 !if "$(PHP_ZTS)" == "yes" -PHP_CPPFLAGS = $(PHP_CPPFLAGS) -DZTS +PHP_CPPFLAGS = $(PHP_CPPFLAGS) -DZTS !endif -ICECPPFLAGS = -I"$(slicedir)" -SLICE2PHPFLAGS = $(ICECPPFLAGS) $(SLICE2PHPFLAGS) +ICECPPFLAGS = -I"$(slicedir)" +SLICE2PHPFLAGS = $(ICECPPFLAGS) $(SLICE2PHPFLAGS) !if "$(USE_NAMESPACES)" == "yes" -CPPFLAGS = $(CPPFLAGS) -DICEPHP_USE_NAMESPACES -SLICE2PHPFLAGS = $(SLICE2PHPFLAGS) -n +CPPFLAGS = $(CPPFLAGS) -DICEPHP_USE_NAMESPACES +SLICE2PHPFLAGS = $(SLICE2PHPFLAGS) -n !endif !if "$(ice_src_dist)" != "" !if "$(ice_cpp_dir)" == "$(ice_dir)\cpp" -SLICE2PHP = $(ice_cpp_dir)\bin\slice2php.exe -SLICEPARSERLIB = $(ice_cpp_dir)\lib\slice.lib +SLICE2PHP = $(ice_cpp_dir)\bin\slice2php.exe +SLICEPARSERLIB = $(ice_cpp_dir)\lib\slice.lib !if !exist ("$(SLICEPARSERLIB)") -SLICEPARSERLIB = $(ice_cpp_dir)\lib\sliced.lib +SLICEPARSERLIB = $(ice_cpp_dir)\lib\sliced.lib !endif !else -SLICE2PHP = $(ice_cpp_dir)\bin$(x64suffix)\slice2php.exe -SLICEPARSERLIB = $(ice_cpp_dir)\lib$(x64suffix)\slice.lib +SLICE2PHP = $(ice_cpp_dir)\bin$(x64suffix)\slice2php.exe +SLICEPARSERLIB = $(ice_cpp_dir)\lib$(x64suffix)\slice.lib !if !exist ("$(SLICEPARSERLIB)") -SLICEPARSERLIB = $(ice_cpp_dir)\lib$(x64suffix)\sliced.lib +SLICEPARSERLIB = $(ice_cpp_dir)\lib$(x64suffix)\sliced.lib !endif !endif !else -SLICE2PHP = $(ice_dir)\bin\slice2php.exe -SLICEPARSERLIB = $(ice_dir)\lib\slice.lib +SLICE2PHP = $(ice_dir)\bin\slice2php.exe +SLICEPARSERLIB = $(ice_dir)\lib\slice.lib !endif -EVERYTHING = all clean install depend +EVERYTHING = all clean install depend EVERYTHING_EXCEPT_INSTALL = all clean depend .SUFFIXES: -.SUFFIXES: .cpp .obj .php .res .rc .d .ice +.SUFFIXES: .cpp .obj .php .res .rc .d .ice DEPEND_DIR = .depend.mak diff --git a/php/config/Make.rules.php b/php/config/Make.rules.php index 8adeb4efa58..691ed6924a4 100644 --- a/php/config/Make.rules.php +++ b/php/config/Make.rules.php @@ -16,7 +16,7 @@ prefix ?= /opt/Ice-$(VERSION) # # The "root directory" for runpath embedded in executables. Can be set -# to change the runpath added to Ice executables. The default is +# to change the runpath added to Ice executables. The default is # platform dependent. # #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) @@ -25,7 +25,7 @@ prefix ?= /opt/Ice-$(VERSION) # Define embedded_runpath as no if you don't want any RPATH added to # the executables. # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define OPTIMIZE as yes if you want to build with optimization. @@ -69,21 +69,21 @@ PHP_HOME ?= /opt/php # php. # ifeq ($(shell test -d $(PHP_HOME) && echo 0),0) - ifeq ($(shell test -d $(PHP_HOME)/include/php5 && echo 0),0) - PHP_INCLUDE_DIR = $(PHP_HOME)/include/php5 - PHP_LIB_DIR = $(PHP_HOME)/lib$(lp64suffix)/php5 - else - PHP_INCLUDE_DIR = $(PHP_HOME)/include/php - PHP_LIB_DIR = $(PHP_HOME)/lib$(lp64suffix)/php - endif + ifeq ($(shell test -d $(PHP_HOME)/include/php5 && echo 0),0) + PHP_INCLUDE_DIR = $(PHP_HOME)/include/php5 + PHP_LIB_DIR = $(PHP_HOME)/lib$(lp64suffix)/php5 + else + PHP_INCLUDE_DIR = $(PHP_HOME)/include/php + PHP_LIB_DIR = $(PHP_HOME)/lib$(lp64suffix)/php + endif else - ifeq ($(shell test -d /usr/include/php5 && echo 0),0) - PHP_INCLUDE_DIR = /usr/include/php5 - PHP_LIB_DIR = /usr/lib$(lp64suffix)/php5 - else - PHP_INCLUDE_DIR = /usr/include/php - PHP_LIB_DIR = /usr/lib$(lp64suffix)/php - endif + ifeq ($(shell test -d /usr/include/php5 && echo 0),0) + PHP_INCLUDE_DIR = /usr/include/php5 + PHP_LIB_DIR = /usr/lib$(lp64suffix)/php5 + else + PHP_INCLUDE_DIR = /usr/include/php + PHP_LIB_DIR = /usr/lib$(lp64suffix)/php + endif endif PHP_FLAGS ?= -I$(PHP_INCLUDE_DIR) -I$(PHP_INCLUDE_DIR)/main -I$(PHP_INCLUDE_DIR)/Zend -I$(PHP_INCLUDE_DIR)/TSRM @@ -101,25 +101,25 @@ ice_require_cpp = yes slice_translator = slice2php ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) - include $(top_srcdir)/config/Make.common.rules + include $(top_srcdir)/config/Make.common.rules else - include $(top_srcdir)/../config/Make.common.rules + include $(top_srcdir)/../config/Make.common.rules endif -libdir = $(top_srcdir)/lib +libdir = $(top_srcdir)/lib ifndef usr_dir_install -install_phpdir = $(prefix)/php -install_libdir = $(prefix)/php + install_phpdir = $(prefix)/php + install_libdir = $(prefix)/php else -install_phpdir = $(prefix)/share/php -install_libdir = $(shell php -r "echo(ini_get('extension_dir'));") + install_phpdir = $(prefix)/share/php + install_libdir = $(shell php -r "echo(ini_get('extension_dir'));") endif ifdef ice_src_dist - RPATH_DIR = $(LOADER_PATH)/../../cpp/$(libsubdir) + RPATH_DIR = $(LOADER_PATH)/../../cpp/$(libsubdir) else - RPATH_DIR = $(ice_dir)/$(libdir) + RPATH_DIR = $(ice_dir)/$(libdir) endif install_bindir = $(prefix)/$(binsubdir) @@ -128,23 +128,23 @@ install_bindir = $(prefix)/$(binsubdir) # Platform specific definitions # ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0) - configdir = $(top_srcdir)/config + configdir = $(top_srcdir)/config else - configdir = $(top_srcdir)/../cpp/config + configdir = $(top_srcdir)/../cpp/config endif include $(configdir)/Make.rules.$(UNAME) ifdef ice_src_dist - ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_cpp_dir)/include + ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_cpp_dir)/include else - ICE_LIB_DIR = -L$(ice_dir)/lib$(lp64suffix) - ICE_FLAGS = -I$(ice_dir)/include + ICE_LIB_DIR = -L$(ice_dir)/lib$(lp64suffix) + ICE_FLAGS = -I$(ice_dir)/include endif ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil ifneq ($(embedded_runpath_prefix),) - runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix) + runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix) endif CPPFLAGS = @@ -153,26 +153,26 @@ SLICE2PHPFLAGS := $(SLICE2PHPFLAGS) $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifeq ("$(USE_NAMESPACES)","yes") - CPPFLAGS := $(CPPFLAGS) -DICEPHP_USE_NAMESPACES - SLICE2PHPFLAGS := $(SLICE2PHPFLAGS) -n + CPPFLAGS := $(CPPFLAGS) -DICEPHP_USE_NAMESPACES + SLICE2PHPFLAGS := $(SLICE2PHPFLAGS) -n endif ifdef ice_src_dist - SLICE2PHP = $(ice_cpp_dir)/$(binsubdir)/slice2php - SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) - endif + SLICE2PHP = $(ice_cpp_dir)/$(binsubdir)/slice2php + SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + ifeq ($(wildcard $(SLICEPARSERLIB)),) + SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) + endif else - SLICE2PHP = $(ice_dir)/$(binsubdir)/slice2php - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) - endif + SLICE2PHP = $(ice_dir)/$(binsubdir)/slice2php + SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + ifeq ($(wildcard $(SLICEPARSERLIB)),) + SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) + endif endif ifeq ($(installphplib),) - installphplib = $(INSTALL) $(1) $(2); \ + installphplib = $(INSTALL) $(1) $(2); \ chmod a+rx $(2)/$(notdir $(1)) endif diff --git a/php/test/Ice/acm/Makefile.mak b/php/test/Ice/acm/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/acm/Makefile.mak +++ b/php/test/Ice/acm/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/binding/Makefile.mak b/php/test/Ice/binding/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/binding/Makefile.mak +++ b/php/test/Ice/binding/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/defaultValue/Makefile.mak b/php/test/Ice/defaultValue/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/defaultValue/Makefile.mak +++ b/php/test/Ice/defaultValue/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/enums/Makefile.mak b/php/test/Ice/enums/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/enums/Makefile.mak +++ b/php/test/Ice/enums/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/exceptions/Makefile.mak b/php/test/Ice/exceptions/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/exceptions/Makefile.mak +++ b/php/test/Ice/exceptions/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/facets/Makefile.mak b/php/test/Ice/facets/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/facets/Makefile.mak +++ b/php/test/Ice/facets/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/info/Makefile.mak b/php/test/Ice/info/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/info/Makefile.mak +++ b/php/test/Ice/info/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/inheritance/Makefile.mak b/php/test/Ice/inheritance/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/inheritance/Makefile.mak +++ b/php/test/Ice/inheritance/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/objects/Makefile.mak b/php/test/Ice/objects/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/objects/Makefile.mak +++ b/php/test/Ice/objects/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/operations/Makefile.mak b/php/test/Ice/operations/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/operations/Makefile.mak +++ b/php/test/Ice/operations/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/optional/Makefile.mak b/php/test/Ice/optional/Makefile.mak index 27e0e2cfa01..ae20622a0b5 100644 --- a/php/test/Ice/optional/Makefile.mak +++ b/php/test/Ice/optional/Makefile.mak @@ -9,7 +9,7 @@ top_srcdir = ..\..\.. -SLICE_SRCS = ClientPrivate.ice Test.ice +SLICE_SRCS = ClientPrivate.ice Test.ice SLICE2PHPFLAGS = -I. !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/proxy/Makefile.mak b/php/test/Ice/proxy/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Ice/proxy/Makefile.mak +++ b/php/test/Ice/proxy/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/slicing/exceptions/Makefile.mak b/php/test/Ice/slicing/exceptions/Makefile.mak index 02aee3b848a..c4802d149a3 100644 --- a/php/test/Ice/slicing/exceptions/Makefile.mak +++ b/php/test/Ice/slicing/exceptions/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Ice/slicing/objects/Makefile.mak b/php/test/Ice/slicing/objects/Makefile.mak index e10fab1b895..f41b97958df 100644 --- a/php/test/Ice/slicing/objects/Makefile.mak +++ b/php/test/Ice/slicing/objects/Makefile.mak @@ -9,8 +9,8 @@ top_srcdir = ..\..\..\.. -SLICE_SRCS = ClientPrivate.ice Forward.ice Test.ice +SLICE_SRCS = ClientPrivate.ice Forward.ice Test.ice -SLICE2PHPFLAGS = -I. +SLICE2PHPFLAGS = -I. !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Slice/keyword/Makefile.mak b/php/test/Slice/keyword/Makefile.mak index 428a0b3f6d1..cc39cb54c31 100644 --- a/php/test/Slice/keyword/Makefile.mak +++ b/php/test/Slice/keyword/Makefile.mak @@ -9,7 +9,7 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Key.ice +SLICE_SRCS = Key.ice SLICE2PHPFLAGS = --underscore !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/php/test/Slice/macros/Makefile.mak b/php/test/Slice/macros/Makefile.mak index ec21eab30f8..fbe3b0de54c 100644 --- a/php/test/Slice/macros/Makefile.mak +++ b/php/test/Slice/macros/Makefile.mak @@ -9,6 +9,6 @@ top_srcdir = ..\..\.. -SLICE_SRCS = Test.ice +SLICE_SRCS = Test.ice !include $(top_srcdir)\config\Make.rules.mak.php diff --git a/python/config/Make.rules b/python/config/Make.rules index 5f160be71e3..3cea9c41887 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -15,7 +15,7 @@ prefix ?= /opt/Ice-$(VERSION) # # The "root directory" for runpath embedded in executables. Can be set -# to change the runpath added to Ice executables. The default is +# to change the runpath added to Ice executables. The default is # platform dependent. # #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) @@ -24,7 +24,7 @@ prefix ?= /opt/Ice-$(VERSION) # Define embedded_runpath as no if you don't want any RPATH added to # the executables. # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define OPTIMIZE as yes if you want to build with optimization. @@ -87,9 +87,9 @@ ice_require_cpp = yes slice_translator = slice2py ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) - include $(top_srcdir)/config/Make.common.rules + include $(top_srcdir)/config/Make.common.rules else - include $(top_srcdir)/../config/Make.common.rules + include $(top_srcdir)/../config/Make.common.rules endif ifndef usr_dir_install @@ -102,9 +102,9 @@ install_bindir = $(prefix)/$(binsubdir) # Platform specific definitions # ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0) - include $(top_srcdir)/config/Make.rules.$(UNAME) + include $(top_srcdir)/config/Make.rules.$(UNAME) else - include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) + include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) endif libdir = $(top_srcdir)/python @@ -122,18 +122,18 @@ else endif ifeq ($(UNAME),SunOS) - ifeq ($(LP64),yes) - libdir = $(top_srcdir)/python$(lp64suffix) - install_libdir = $(prefix)/python$(lp64suffix) - endif + ifeq ($(LP64),yes) + libdir = $(top_srcdir)/python$(lp64suffix) + install_libdir = $(prefix)/python$(lp64suffix) + endif endif ifdef ice_src_dist - ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_cpp_dir)/include + ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_cpp_dir)/include else - ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_dir)/include + ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_dir)/include endif ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil @@ -143,31 +143,31 @@ SLICE2PYFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifdef ice_src_dist - SLICE2PY = $(ice_cpp_dir)/bin/slice2py - SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) - endif + SLICE2PY = $(ice_cpp_dir)/bin/slice2py + SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + ifeq ($(wildcard $(SLICEPARSERLIB)),) + SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) + endif else - SLICE2PY = $(ice_dir)/$(binsubdir)/slice2py - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) - endif + SLICE2PY = $(ice_dir)/$(binsubdir)/slice2py + SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + ifeq ($(wildcard $(SLICEPARSERLIB)),) + SLICEPARSERLIB = $(ice_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) + endif endif # # A Python extension library cannot have a "lib" prefix, so Python-specific # functions are defined that strip "lib" from the regular library name. # -mkpylibfilename = $(subst dy,dylib,$(subst lib,,$(call mklibfilename,$(1),$(2)))) +mkpylibfilename = $(subst dy,dylib,$(subst lib,,$(call mklibfilename,$(1),$(2)))) mkpysoname = $(subst dy,dylib,$(subst lib,,$(call mksoname,$(1),$(2)))) mkpylibname = $(subst dy,dylib,$(subst lib,,$(call mklibname,$(1)))) -EVERYTHING = all depend clean install +EVERYTHING = all depend clean install .SUFFIXES: -.SUFFIXES: .cpp .o .py +.SUFFIXES: .cpp .o .py all:: $(SRCS) diff --git a/python/config/Make.rules.Linux b/python/config/Make.rules.Linux index 0690dd5e3e0..8d6d7c1204a 100644 --- a/python/config/Make.rules.Linux +++ b/python/config/Make.rules.Linux @@ -24,4 +24,4 @@ ifeq ($(CXX),g++) endif endif -mkshlib = $(CXX) -shared $(LDFLAGS) $(LDEXEFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread
\ No newline at end of file +mkshlib = $(CXX) -shared $(LDFLAGS) $(LDEXEFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread diff --git a/python/config/Make.rules.mak b/python/config/Make.rules.mak index ecc3fecbc5c..eabd2f38e52 100644 --- a/python/config/Make.rules.mak +++ b/python/config/Make.rules.mak @@ -25,7 +25,7 @@ OPTIMIZE = yes # Specify your C++ compiler, or leave unset for auto-detection. The # only value currently supported to build IcePy is VC100. # -#CPP_COMPILER = VCxxx +#CPP_COMPILER = VCxxx # # Set PYTHON_HOME to your Python installation directory. @@ -51,7 +51,7 @@ slice_translator = slice2py.exe !include $(top_srcdir)\config\Make.common.rules.mak !endif -libdir = $(top_srcdir)\python +libdir = $(top_srcdir)\python install_pythondir = $(prefix)\python$(x64suffix) install_libdir = $(prefix)\python$(x64suffix) @@ -68,7 +68,7 @@ RCFLAGS = -D_DEBUG # # Import libraries are located automatically # -ICE_LIBS = +ICE_LIBS = !if "$(ice_src_dist)" != "" ICE_CPPFLAGS = -I"$(ice_cpp_dir)\include" diff --git a/python/modules/IcePy/Makefile b/python/modules/IcePy/Makefile index 3efba732368..72e252b757f 100644 --- a/python/modules/IcePy/Makefile +++ b/python/modules/IcePy/Makefile @@ -16,7 +16,7 @@ LIBNAME = $(call mkpylibname,IcePy) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = BatchRequestInterceptor.o \ - Communicator.o \ + Communicator.o \ Connection.o \ ConnectionInfo.o \ Current.o \ diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules index cf90937b51d..a2f15aec441 100644 --- a/ruby/config/Make.rules +++ b/ruby/config/Make.rules @@ -25,7 +25,7 @@ prefix ?= /opt/Ice-$(VERSION) # Define embedded_runpath as no if you don't want any RPATH added to # the executables. # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define OPTIMIZE as yes if you want to build with optimization. @@ -45,7 +45,7 @@ embedded_runpath ?= yes # you have installed the Ice for C++ development kit in a # non-standard location, set the ICE_HOME to the installation directory. # -#ICE_HOME = C:\Program Files\ZeroC\Ice-$(VERSION) +#ICE_HOME = C:\Program Files\ZeroC\Ice-$(VERSION) # # If the Ruby interpreter is in your PATH, the settings below will @@ -135,9 +135,9 @@ ice_require_cpp = yes slice_translator = slice2rb ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0) - include $(top_srcdir)/config/Make.common.rules + include $(top_srcdir)/config/Make.common.rules else - include $(top_srcdir)/../config/Make.common.rules + include $(top_srcdir)/../config/Make.common.rules endif libdir = $(top_srcdir)/ruby @@ -165,23 +165,23 @@ install_bindir = $(prefix)/$(binsubdir) # Platform specific definitions # ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0) - configdir = $(top_srcdir)/config + configdir = $(top_srcdir)/config else - configdir = $(top_srcdir)/../cpp/config + configdir = $(top_srcdir)/../cpp/config endif ifndef usr_dir_install -RPATH_DIR = $(prefix)/$(libsubdir) + RPATH_DIR = $(prefix)/$(libsubdir) endif include $(configdir)/Make.rules.$(UNAME) ifdef ice_src_dist - ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_cpp_dir)/include + ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_cpp_dir)/include else - ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_dir)/include + ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_dir)/include endif ICE_LIBS = $(ICE_LIB_DIR) -lIceDiscovery -lIce -lIceSSL -lSlice -lIceUtil @@ -191,11 +191,11 @@ SLICE2RBFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) ifdef ice_src_dist - SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2RB = $(ice_cpp_dir)/$(binsubdir)/$(slice_translator) + SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICE2RB = $(ice_cpp_dir)/$(binsubdir)/$(slice_translator) else - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2RB = $(ice_dir)/$(binsubdir)/$(slice_translator) + SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) + SLICE2RB = $(ice_dir)/$(binsubdir)/$(slice_translator) endif EVERYTHING = all depend clean install diff --git a/ruby/config/Make.rules.MINGW b/ruby/config/Make.rules.MINGW index f8a1d8dbc94..6e73ccf9ed0 100644 --- a/ruby/config/Make.rules.MINGW +++ b/ruby/config/Make.rules.MINGW @@ -13,6 +13,7 @@ include $(top_srcdir)/../cpp/config/Make.rules.MINGW mkrblibfilename = $(1).so + # # Define the following names so the rule to build $(libdir)/$(LIBFILENAME) # is not override by $(libdir)/$(SONAME) and $(libdir)/$(LIBNAME) @@ -21,10 +22,9 @@ mkrblibfilename = $(1).so mkrbsoname = $(if $(2),lib$(1).xxx.$(2),lib$(1).xxx) mkrblibname = $(1).xxx - libdir = $(top_srcdir)/ruby ifdef ice_bin_dist SLICE2RB = $(ice_dir)/bin/$(slice_translator) SLICEPARSERLIB = $(SLICE2RB) -endif
\ No newline at end of file +endif |