diff options
| author | Jose <jose@zeroc.com> | 2014-11-20 18:42:16 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-20 18:42:16 +0100 |
| commit | f3471e8d65bc2342cb13050faaf94784e6405413 (patch) | |
| tree | 87b92fcf2cade1f0d3f81866651314925693e7ad /cpp | |
| parent | ICE-5927 - Fixed IceJS browser Ice/timeout test failure on Chrome in (diff) | |
| download | ice-f3471e8d65bc2342cb13050faaf94784e6405413.tar.bz2 ice-f3471e8d65bc2342cb13050faaf94784e6405413.tar.xz ice-f3471e8d65bc2342cb13050faaf94784e6405413.zip | |
ICE-5931, ICE-5935
Diffstat (limited to 'cpp')
105 files changed, 627 insertions, 901 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 7b0556d93c1..ebb87fc17ce 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -14,19 +14,6 @@ prefix ?= /opt/Ice-$(VERSION) # -# The "root directory" for runpath embedded in executables. Can be unset -# to avoid adding a runpath to Ice executables. -# -embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) - -# -# Define create_runpath_symlink as yes if you would like 'make install' -# to automatically create a symbolic link for the embedded runpath -# directory. Only applies if embedded_runpath_prefix is also set. -# -create_runpath_symlink ?= no - -# # Define OPTIMIZE as yes if you want to build with # optimization. Otherwise Ice is build with debug information. # @@ -196,12 +183,6 @@ else install_mandir := $(prefix)/share/man/man1 endif -ifneq ($(embedded_runpath_prefix),) - runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) -else - create_runpath_symlink = no -endif - ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) ICEUTIL_FLAGS = -DICE_PRIO_INHERIT endif @@ -313,7 +294,7 @@ ifeq ($(mktestname),) endif ifeq ($(mktest),) - mktest = $(CXX) $(LDFLAGS) -o $(@) $(2) $(3) + mktest = $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $(@) $(2) $(3) endif ifdef ice_src_dist diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index de9c2fc8f93..baafa004a4d 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -44,21 +44,28 @@ endif CXXLIBS = ifeq ($(RPATH_DIR),) - ifdef ice_src_dist - RPATH_DIR = @loader_path/$(libdir) - else - RPATH_DIR = $(runpath_libdir) - endif +ifdef ice_src_dist +RPATH_DIR = @loader_path/$(libdir) +else +RPATH_DIR = $(ice_dir)/$(libsubdir) +endif +endif + +ifneq ($(RPATH_DIR),) +LDEXEFLAGS = -Wl,-rpath,$(RPATH_DIR) +endif + +ifdef ice_src_dist +rpathlink = -Wl,-rpath,$(1) endif -LDPLATFORMFLAGS = -Wl,-rpath,$(RPATH_DIR) -mklib = libtool -static -o $(1) $(2) -mkshlib = $(CXX) -dynamiclib $(LDFLAGS) -o $(1) -install_name @rpath/$(2) $(3) $(4) +mklib = libtool -static -o $(1) $(2) +mkshlib = $(CXX) -dynamiclib $(LDFLAGS) -o $(1) -install_name @rpath/$(2) $(3) $(4) BASELIBS = -lIceUtil LIBS = -lIce $(BASELIBS) -ICONV_LIB = -liconv +ICONV_LIB = -liconv ICEUTIL_OS_LIBS = ICE_OS_LIBS = -ldl diff --git a/cpp/demo/Database/Oracle/occi/Makefile b/cpp/demo/Database/Oracle/occi/Makefile index 21dc52e64e9..5737831c0e4 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile +++ b/cpp/demo/Database/Oracle/occi/Makefile @@ -40,11 +40,11 @@ ORACLE_LIBS = -L$(ORACLE_HOME)/lib -locci -lclntsh $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ diff --git a/cpp/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile index 93fe15c317b..ac03eebdb8e 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile +++ b/cpp/demo/Database/Oracle/proc/Makefile @@ -52,11 +52,11 @@ ORACLE_LIBS = -L$(ORACLE_HOME)/lib -lclntsh $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) clean:: -rm -f $(GENERATED_PROC_FILES) diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile index c280fc6439e..1e71b7e638f 100644 --- a/cpp/demo/Freeze/backup/Makefile +++ b/cpp/demo/Freeze/backup/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index 4f5f2d780d9..cc5cf939ba6 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -27,7 +27,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/demo/Freeze/casino/Makefile b/cpp/demo/Freeze/casino/Makefile index a61061398f4..d543112d3be 100644 --- a/cpp/demo/Freeze/casino/Makefile +++ b/cpp/demo/Freeze/casino/Makefile @@ -39,11 +39,11 @@ SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: -rm -rf db/__catalog db/__catalogIndexList db/bet db/bank db/player db/log.* db/__Freeze diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile index 885fedacf52..2fe90b27907 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile +++ b/cpp/demo/Freeze/customEvictor/Makefile @@ -40,11 +40,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index 00abb40611c..7e2e5faed69 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -53,11 +53,11 @@ SLICE2CPPFLAGS := --ice $(SLICE2CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(COLLOCATED): $(COLOBJS) rm -f $@ diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index 3cf4c7de0a9..d26f316be0d 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -53,7 +53,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(READLINE_FLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) $(SERVER): $(SOBJS) rm -f $@ @@ -61,7 +61,7 @@ $(SERVER): $(SOBJS) $(COLLOCATED): $(COLOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/demo/Freeze/transform/Makefile b/cpp/demo/Freeze/transform/Makefile index 79691e54ee9..f0cd89dce0a 100644 --- a/cpp/demo/Freeze/transform/Makefile +++ b/cpp/demo/Freeze/transform/Makefile @@ -33,19 +33,19 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CREATE): $(CREATE_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(CREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READ): $(READ_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(READ_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(READ_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READNEW): $(READNEW_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(READNEW_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(READNEW_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(RECREATE): $(RECREATE_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(RECREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(RECREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with diff --git a/cpp/demo/Glacier2/callback/Makefile b/cpp/demo/Glacier2/callback/Makefile index 313251d00df..c85d3fee238 100644 --- a/cpp/demo/Glacier2/callback/Makefile +++ b/cpp/demo/Glacier2/callback/Makefile @@ -33,8 +33,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Glacier2/chat/Makefile b/cpp/demo/Glacier2/chat/Makefile index 32350e120bc..4dfc23cca0c 100644 --- a/cpp/demo/Glacier2/chat/Makefile +++ b/cpp/demo/Glacier2/chat/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) diff --git a/cpp/demo/Ice/async/Makefile b/cpp/demo/Ice/async/Makefile index 4cd1828e259..307c6af5e5a 100644 --- a/cpp/demo/Ice/async/Makefile +++ b/cpp/demo/Ice/async/Makefile @@ -33,8 +33,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/bidir/Makefile b/cpp/demo/Ice/bidir/Makefile index 54e74ac9920..34fb63e884d 100644 --- a/cpp/demo/Ice/bidir/Makefile +++ b/cpp/demo/Ice/bidir/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile index e6216e2af8a..49aa264f436 100644 --- a/cpp/demo/Ice/callback/Makefile +++ b/cpp/demo/Ice/callback/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/context/Makefile b/cpp/demo/Ice/context/Makefile index b5aceebdc58..e77a2fc8fbc 100644 --- a/cpp/demo/Ice/context/Makefile +++ b/cpp/demo/Ice/context/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/converter/Makefile b/cpp/demo/Ice/converter/Makefile index f68793eab81..cdfa50653cb 100644 --- a/cpp/demo/Ice/converter/Makefile +++ b/cpp/demo/Ice/converter/Makefile @@ -40,12 +40,12 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT1): $(C1OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(C1OBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(C1OBJS) $(LIBS) $(CLIENT2): $(C2OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(C2OBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(C2OBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/hello/Makefile b/cpp/demo/Ice/hello/Makefile index e728700a0f8..4b2875c0899 100644 --- a/cpp/demo/Ice/hello/Makefile +++ b/cpp/demo/Ice/hello/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/interleaved/Makefile b/cpp/demo/Ice/interleaved/Makefile index 3d2859ab528..cb7c65b16de 100755 --- a/cpp/demo/Ice/interleaved/Makefile +++ b/cpp/demo/Ice/interleaved/Makefile @@ -40,8 +40,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/invoke/Makefile b/cpp/demo/Ice/invoke/Makefile index 087b2148d15..826b16af829 100644 --- a/cpp/demo/Ice/invoke/Makefile +++ b/cpp/demo/Ice/invoke/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/latency/Makefile b/cpp/demo/Ice/latency/Makefile index 1dd71669882..78eaaf7178c 100644 --- a/cpp/demo/Ice/latency/Makefile +++ b/cpp/demo/Ice/latency/Makefile @@ -31,8 +31,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/minimal/Makefile b/cpp/demo/Ice/minimal/Makefile index e728700a0f8..4b2875c0899 100644 --- a/cpp/demo/Ice/minimal/Makefile +++ b/cpp/demo/Ice/minimal/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/multicast/Makefile b/cpp/demo/Ice/multicast/Makefile index fb26f41fe08..ef22740854d 100644 --- a/cpp/demo/Ice/multicast/Makefile +++ b/cpp/demo/Ice/multicast/Makefile @@ -36,4 +36,4 @@ $(CLIENT): $(COBJS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/nested/Makefile b/cpp/demo/Ice/nested/Makefile index 10fc8532ba1..0e47d7a7131 100644 --- a/cpp/demo/Ice/nested/Makefile +++ b/cpp/demo/Ice/nested/Makefile @@ -33,8 +33,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/nrvo/Makefile b/cpp/demo/Ice/nrvo/Makefile index 414590dc559..548fb846768 100644 --- a/cpp/demo/Ice/nrvo/Makefile +++ b/cpp/demo/Ice/nrvo/Makefile @@ -34,8 +34,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/optional/Makefile b/cpp/demo/Ice/optional/Makefile index 98613ce4286..7cbe51aad08 100644 --- a/cpp/demo/Ice/optional/Makefile +++ b/cpp/demo/Ice/optional/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/plugin/Makefile b/cpp/demo/Ice/plugin/Makefile index c9c45395c90..d7835743a4b 100644 --- a/cpp/demo/Ice/plugin/Makefile +++ b/cpp/demo/Ice/plugin/Makefile @@ -41,11 +41,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(LOGGERFILENAME): $(LOBJS) rm -f $@ diff --git a/cpp/demo/Ice/properties/Makefile b/cpp/demo/Ice/properties/Makefile index 64f7f9e9997..3b6af49da73 100644 --- a/cpp/demo/Ice/properties/Makefile +++ b/cpp/demo/Ice/properties/Makefile @@ -31,8 +31,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/session/Makefile b/cpp/demo/Ice/session/Makefile index 7a32dc7abe4..3d0412bf1e4 100644 --- a/cpp/demo/Ice/session/Makefile +++ b/cpp/demo/Ice/session/Makefile @@ -35,8 +35,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile index 2a0331f2ee4..c407ecee7c5 100644 --- a/cpp/demo/Ice/throughput/Makefile +++ b/cpp/demo/Ice/throughput/Makefile @@ -41,8 +41,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile index 5f71fe2718d..2fedce1a9fc 100644 --- a/cpp/demo/Ice/value/Makefile +++ b/cpp/demo/Ice/value/Makefile @@ -35,8 +35,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile index dbf8ef3a192..1cfcfbccfec 100644 --- a/cpp/demo/IceBox/hello/Makefile +++ b/cpp/demo/IceBox/hello/Makefile @@ -39,4 +39,4 @@ $(LIBFILENAME): $(SOBJS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) diff --git a/cpp/demo/IceDiscovery/hello/Makefile b/cpp/demo/IceDiscovery/hello/Makefile index e728700a0f8..4b2875c0899 100644 --- a/cpp/demo/IceDiscovery/hello/Makefile +++ b/cpp/demo/IceDiscovery/hello/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/IceDiscovery/replication/Makefile b/cpp/demo/IceDiscovery/replication/Makefile index 3409d863eb4..992adc2de60 100644 --- a/cpp/demo/IceDiscovery/replication/Makefile +++ b/cpp/demo/IceDiscovery/replication/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/demo/IceGrid/allocate/Makefile b/cpp/demo/IceGrid/allocate/Makefile index 573211d93e7..0e8c1ad0e02 100644 --- a/cpp/demo/IceGrid/allocate/Makefile +++ b/cpp/demo/IceGrid/allocate/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node/* db/registry/* diff --git a/cpp/demo/IceGrid/customLoadBalancing/Makefile b/cpp/demo/IceGrid/customLoadBalancing/Makefile index b558884b076..abadce81bfb 100644 --- a/cpp/demo/IceGrid/customLoadBalancing/Makefile +++ b/cpp/demo/IceGrid/customLoadBalancing/Makefile @@ -40,11 +40,11 @@ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LINKWITH) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LINKWITH) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LINKWITH) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LINKWITH) $(LIBFILENAME): $(POBJS) rm -f $@ diff --git a/cpp/demo/IceGrid/icebox/Makefile b/cpp/demo/IceGrid/icebox/Makefile index be4169ff740..2df5841878f 100644 --- a/cpp/demo/IceGrid/icebox/Makefile +++ b/cpp/demo/IceGrid/icebox/Makefile @@ -39,7 +39,7 @@ $(LIBFILENAME): $(SOBJS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) clean:: -rm -rf db/node/* db/registry/* diff --git a/cpp/demo/IceGrid/replication/Makefile b/cpp/demo/IceGrid/replication/Makefile index 9d4259c2e62..2626bb6ce63 100644 --- a/cpp/demo/IceGrid/replication/Makefile +++ b/cpp/demo/IceGrid/replication/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/master/* db/node1/* db/node2/* db/replica1/* db/replica2/* diff --git a/cpp/demo/IceGrid/secure/Makefile b/cpp/demo/IceGrid/secure/Makefile index 262eb97cf83..929cd8e66d0 100644 --- a/cpp/demo/IceGrid/secure/Makefile +++ b/cpp/demo/IceGrid/secure/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/master/* db/slave/* db/node/* certs/* diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile b/cpp/demo/IceGrid/sessionActivation/Makefile index 573211d93e7..0e8c1ad0e02 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile +++ b/cpp/demo/IceGrid/sessionActivation/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node/* db/registry/* diff --git a/cpp/demo/IceGrid/simple/Makefile b/cpp/demo/IceGrid/simple/Makefile index 573211d93e7..0e8c1ad0e02 100644 --- a/cpp/demo/IceGrid/simple/Makefile +++ b/cpp/demo/IceGrid/simple/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node/* db/registry/* diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile index aa91b29d3f4..c6bdc2a9ce9 100644 --- a/cpp/demo/IceStorm/clock/Makefile +++ b/cpp/demo/IceStorm/clock/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/* diff --git a/cpp/demo/IceStorm/counter/Makefile b/cpp/demo/IceStorm/counter/Makefile index f0fa0c7fc66..ed4bf77a65c 100644 --- a/cpp/demo/IceStorm/counter/Makefile +++ b/cpp/demo/IceStorm/counter/Makefile @@ -34,11 +34,11 @@ IS_LIBS := -lIceStorm $(LIBS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(IS_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(IS_LIBS) clean:: -rm -rf db/* diff --git a/cpp/demo/IceStorm/replicated/Makefile b/cpp/demo/IceStorm/replicated/Makefile index d627095e46d..fcffb37b32f 100644 --- a/cpp/demo/IceStorm/replicated/Makefile +++ b/cpp/demo/IceStorm/replicated/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm -lGlacier2 $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) -lIceGrid + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) -lIceGrid clean:: -rm -rf db/node/* db/registry/* db/*.db diff --git a/cpp/demo/IceStorm/replicated2/Makefile b/cpp/demo/IceStorm/replicated2/Makefile index 7307ed7708d..e380c3ef816 100644 --- a/cpp/demo/IceStorm/replicated2/Makefile +++ b/cpp/demo/IceStorm/replicated2/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db1/* diff --git a/cpp/demo/IceUtil/workqueue/Makefile b/cpp/demo/IceUtil/workqueue/Makefile index f24191c083e..3776fef6569 100644 --- a/cpp/demo/IceUtil/workqueue/Makefile +++ b/cpp/demo/IceUtil/workqueue/Makefile @@ -21,4 +21,4 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(BASELIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(COBJS) $(BASELIBS) diff --git a/cpp/demo/Manual/evictor_filesystem/Makefile b/cpp/demo/Manual/evictor_filesystem/Makefile index 70b72c839d0..61ce77e736d 100644 --- a/cpp/demo/Manual/evictor_filesystem/Makefile +++ b/cpp/demo/Manual/evictor_filesystem/Makefile @@ -38,11 +38,11 @@ SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: -rm -rf db/* diff --git a/cpp/demo/Manual/lifecycle/Makefile b/cpp/demo/Manual/lifecycle/Makefile index 8701c10b8a9..4939ae641d7 100644 --- a/cpp/demo/Manual/lifecycle/Makefile +++ b/cpp/demo/Manual/lifecycle/Makefile @@ -36,8 +36,8 @@ SLICE2CPPFLAGS := --ice $(SLICE2CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) $(LIBS) diff --git a/cpp/demo/Manual/map_filesystem/Makefile b/cpp/demo/Manual/map_filesystem/Makefile index 73dda59bca1..121d2ad56a2 100644 --- a/cpp/demo/Manual/map_filesystem/Makefile +++ b/cpp/demo/Manual/map_filesystem/Makefile @@ -41,11 +41,11 @@ SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) IdentityFileEntryMap.h: IdentityFileEntryMap.cpp IdentityFileEntryMap.cpp: FilesystemDB.ice Filesystem.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) diff --git a/cpp/demo/Manual/printer/Makefile b/cpp/demo/Manual/printer/Makefile index 570005fcc1a..cb3ce197804 100644 --- a/cpp/demo/Manual/printer/Makefile +++ b/cpp/demo/Manual/printer/Makefile @@ -31,10 +31,10 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) test:: diff --git a/cpp/demo/Manual/simple_filesystem/Makefile b/cpp/demo/Manual/simple_filesystem/Makefile index 54eef563847..f120fa3ad0d 100644 --- a/cpp/demo/Manual/simple_filesystem/Makefile +++ b/cpp/demo/Manual/simple_filesystem/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index ee6caa7f443..558d92553f7 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -54,7 +54,7 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_LIBS) +LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_RPATH_LINK) $(DB_LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 16c527aec77..aa54d63ad78 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -46,11 +46,11 @@ BISONFLAGS := --name-prefix "freeze_script_" $(BISONFLAGS) $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) install:: all $(call installprogram,$(TRANSFORMDB),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile index 5bf28436f62..bd6df67448d 100644 --- a/cpp/src/Glacier2/Makefile +++ b/cpp/src/Glacier2/Makefile @@ -38,7 +38,7 @@ SLICE2CPPFLAGS := --include-dir Glacier2 $(SLICE2CPPFLAGS) $(ROUTER): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lGlacier2 $(LIBS) -lIceSSL $(OPENSSL_LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) -lGlacier2 $(LIBS) -lIceSSL $(OPENSSL_LIBS) install:: all $(call installprogram,$(ROUTER),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index b2e67c45858..791bbed83bc 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -58,11 +58,11 @@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) $(SERVER): $(SOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lIceBox $(LIBS) $(ADMIN): $(AOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceBox $(LIBS) install:: all $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp index c4790117810..fa3e30873a9 100644 --- a/cpp/src/IceGrid/Grammar.cpp +++ b/cpp/src/IceGrid/Grammar.cpp @@ -1,23 +1,24 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -28,7 +29,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -46,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -54,21 +55,106 @@ /* Pure parsers. */ #define YYPURE 1 -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - /* Using locations. */ #define YYLSP_NEEDED 0 -/* Copy the first part of user declarations. */ +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + ICE_GRID_HELP = 258, + ICE_GRID_EXIT = 259, + ICE_GRID_APPLICATION = 260, + ICE_GRID_NODE = 261, + ICE_GRID_REGISTRY = 262, + ICE_GRID_SERVER = 263, + ICE_GRID_ADAPTER = 264, + ICE_GRID_PING = 265, + ICE_GRID_LOAD = 266, + ICE_GRID_SOCKETS = 267, + ICE_GRID_ADD = 268, + ICE_GRID_REMOVE = 269, + ICE_GRID_LIST = 270, + ICE_GRID_SHUTDOWN = 271, + ICE_GRID_STRING = 272, + ICE_GRID_START = 273, + ICE_GRID_STOP = 274, + ICE_GRID_PATCH = 275, + ICE_GRID_SIGNAL = 276, + ICE_GRID_STDOUT = 277, + ICE_GRID_STDERR = 278, + ICE_GRID_DESCRIBE = 279, + ICE_GRID_PROPERTIES = 280, + ICE_GRID_PROPERTY = 281, + ICE_GRID_STATE = 282, + ICE_GRID_PID = 283, + ICE_GRID_ENDPOINTS = 284, + ICE_GRID_ACTIVATION = 285, + ICE_GRID_OBJECT = 286, + ICE_GRID_FIND = 287, + ICE_GRID_SHOW = 288, + ICE_GRID_COPYING = 289, + ICE_GRID_WARRANTY = 290, + ICE_GRID_DIFF = 291, + ICE_GRID_UPDATE = 292, + ICE_GRID_INSTANTIATE = 293, + ICE_GRID_TEMPLATE = 294, + ICE_GRID_SERVICE = 295, + ICE_GRID_ENABLE = 296, + ICE_GRID_DISABLE = 297 + }; +#endif +/* Tokens. */ +#define ICE_GRID_HELP 258 +#define ICE_GRID_EXIT 259 +#define ICE_GRID_APPLICATION 260 +#define ICE_GRID_NODE 261 +#define ICE_GRID_REGISTRY 262 +#define ICE_GRID_SERVER 263 +#define ICE_GRID_ADAPTER 264 +#define ICE_GRID_PING 265 +#define ICE_GRID_LOAD 266 +#define ICE_GRID_SOCKETS 267 +#define ICE_GRID_ADD 268 +#define ICE_GRID_REMOVE 269 +#define ICE_GRID_LIST 270 +#define ICE_GRID_SHUTDOWN 271 +#define ICE_GRID_STRING 272 +#define ICE_GRID_START 273 +#define ICE_GRID_STOP 274 +#define ICE_GRID_PATCH 275 +#define ICE_GRID_SIGNAL 276 +#define ICE_GRID_STDOUT 277 +#define ICE_GRID_STDERR 278 +#define ICE_GRID_DESCRIBE 279 +#define ICE_GRID_PROPERTIES 280 +#define ICE_GRID_PROPERTY 281 +#define ICE_GRID_STATE 282 +#define ICE_GRID_PID 283 +#define ICE_GRID_ENDPOINTS 284 +#define ICE_GRID_ACTIVATION 285 +#define ICE_GRID_OBJECT 286 +#define ICE_GRID_FIND 287 +#define ICE_GRID_SHOW 288 +#define ICE_GRID_COPYING 289 +#define ICE_GRID_WARRANTY 290 +#define ICE_GRID_DIFF 291 +#define ICE_GRID_UPDATE 292 +#define ICE_GRID_INSTANTIATE 293 +#define ICE_GRID_TEMPLATE 294 +#define ICE_GRID_SERVICE 295 +#define ICE_GRID_ENABLE 296 +#define ICE_GRID_DISABLE 297 -/* Line 189 of yacc.c */ -#line 1 "Grammar.y" + + + +/* Copy the first part of user declarations. */ +#line 1 "../IceGrid/Grammar.y" // ********************************************************************** @@ -110,9 +196,6 @@ yyerror(const char* s) -/* Line 189 of yacc.c */ -#line 115 "Grammar.tab.c" - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 1 @@ -131,71 +214,20 @@ yyerror(const char* s) # define YYTOKEN_TABLE 0 #endif - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ICE_GRID_HELP = 258, - ICE_GRID_EXIT = 259, - ICE_GRID_APPLICATION = 260, - ICE_GRID_NODE = 261, - ICE_GRID_REGISTRY = 262, - ICE_GRID_SERVER = 263, - ICE_GRID_ADAPTER = 264, - ICE_GRID_PING = 265, - ICE_GRID_LOAD = 266, - ICE_GRID_SOCKETS = 267, - ICE_GRID_ADD = 268, - ICE_GRID_REMOVE = 269, - ICE_GRID_LIST = 270, - ICE_GRID_SHUTDOWN = 271, - ICE_GRID_STRING = 272, - ICE_GRID_START = 273, - ICE_GRID_STOP = 274, - ICE_GRID_PATCH = 275, - ICE_GRID_SIGNAL = 276, - ICE_GRID_STDOUT = 277, - ICE_GRID_STDERR = 278, - ICE_GRID_DESCRIBE = 279, - ICE_GRID_PROPERTIES = 280, - ICE_GRID_PROPERTY = 281, - ICE_GRID_STATE = 282, - ICE_GRID_PID = 283, - ICE_GRID_ENDPOINTS = 284, - ICE_GRID_ACTIVATION = 285, - ICE_GRID_OBJECT = 286, - ICE_GRID_FIND = 287, - ICE_GRID_SHOW = 288, - ICE_GRID_COPYING = 289, - ICE_GRID_WARRANTY = 290, - ICE_GRID_DIFF = 291, - ICE_GRID_UPDATE = 292, - ICE_GRID_INSTANTIATE = 293, - ICE_GRID_TEMPLATE = 294, - ICE_GRID_SERVICE = 295, - ICE_GRID_ENABLE = 296, - ICE_GRID_DISABLE = 297 - }; -#endif - - - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif + /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ -#line 199 "Grammar.tab.c" +/* Line 216 of yacc.c. */ +#line 231 "Grammar.tab.c" #ifdef short # undef short @@ -245,7 +277,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -270,14 +302,14 @@ typedef short int yytype_int16; #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID (int yyi) +YYID (int i) #else static int -YYID (yyi) - int yyi; +YYID (i) + int i; #endif { - return yyi; + return i; } #endif @@ -358,9 +390,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; -}; + yytype_int16 yyss; + YYSTYPE yyvs; + }; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -394,12 +426,12 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +# define YYSTACK_RELOCATE(Stack) \ do \ { \ YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ @@ -1421,7 +1453,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1532,20 +1564,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -1579,11 +1608,11 @@ yy_reduce_print (yyvsp, yyrule) /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - YYFPRINTF (stderr, " $%d = ", yyi + 1); + fprintf (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) ); - YYFPRINTF (stderr, "\n"); + fprintf (stderr, "\n"); } } @@ -1863,8 +1892,10 @@ yydestruct (yymsg, yytype, yyvaluep) break; } } + /* Prevent warnings from -Wmissing-prototypes. */ + #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); @@ -1883,9 +1914,10 @@ int yyparse (); -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ + +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1909,46 +1941,22 @@ yyparse () #endif #endif { -/* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ - int yynerrs; - - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - YYSIZE_T yystacksize; +/* Number of syntax errors so far. */ +int yynerrs; + int yystate; int yyn; int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; #if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; @@ -1956,28 +1964,51 @@ YYSTYPE yylval; YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ + yyssp = yyss; yyvsp = yyvs; @@ -2007,6 +2038,7 @@ YYSTYPE yylval; YYSTYPE *yyvs1 = yyvs; yytype_int16 *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -2014,6 +2046,7 @@ YYSTYPE yylval; yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); yyss = yyss1; @@ -2036,8 +2069,9 @@ YYSTYPE yylval; (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + # undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); @@ -2048,6 +2082,7 @@ YYSTYPE yylval; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; + YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); @@ -2057,9 +2092,6 @@ YYSTYPE yylval; YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - if (yystate == YYFINAL) - YYACCEPT; - goto yybackup; /*-----------. @@ -2068,16 +2100,16 @@ YYSTYPE yylval; yybackup: /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ + look-ahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2109,16 +2141,20 @@ yybackup: goto yyreduce; } + if (yyn == YYFINAL) + YYACCEPT; + /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the lookahead token. */ + /* Shift the look-ahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token. */ - yychar = YYEMPTY; + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; yystate = yyn; *++yyvsp = yylval; @@ -2158,1049 +2194,815 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1455 of yacc.c */ -#line 96 "Grammar.y" +#line 96 "../IceGrid/Grammar.y" { ;} break; case 3: - -/* Line 1455 of yacc.c */ -#line 99 "Grammar.y" +#line 99 "../IceGrid/Grammar.y" { ;} break; case 4: - -/* Line 1455 of yacc.c */ -#line 107 "Grammar.y" +#line 107 "../IceGrid/Grammar.y" { ;} break; case 5: - -/* Line 1455 of yacc.c */ -#line 110 "Grammar.y" +#line 110 "../IceGrid/Grammar.y" { ;} break; case 6: - -/* Line 1455 of yacc.c */ -#line 116 "Grammar.y" +#line 116 "../IceGrid/Grammar.y" { parser->checkInterrupted(); ;} break; case 7: - -/* Line 1455 of yacc.c */ -#line 125 "Grammar.y" +#line 125 "../IceGrid/Grammar.y" { parser->usage(); ;} break; case 8: - -/* Line 1455 of yacc.c */ -#line 129 "Grammar.y" +#line 129 "../IceGrid/Grammar.y" { return 0; ;} break; case 9: - -/* Line 1455 of yacc.c */ -#line 133 "Grammar.y" +#line 133 "../IceGrid/Grammar.y" { parser->addApplication((yyvsp[(3) - (4)])); ;} break; case 10: - -/* Line 1455 of yacc.c */ -#line 137 "Grammar.y" +#line 137 "../IceGrid/Grammar.y" { parser->usage("application", "add"); ;} break; case 11: - -/* Line 1455 of yacc.c */ -#line 141 "Grammar.y" +#line 141 "../IceGrid/Grammar.y" { parser->removeApplication((yyvsp[(3) - (4)])); ;} break; case 12: - -/* Line 1455 of yacc.c */ -#line 145 "Grammar.y" +#line 145 "../IceGrid/Grammar.y" { parser->usage("application", "remove"); ;} break; case 13: - -/* Line 1455 of yacc.c */ -#line 149 "Grammar.y" +#line 149 "../IceGrid/Grammar.y" { parser->diffApplication((yyvsp[(3) - (4)])); ;} break; case 14: - -/* Line 1455 of yacc.c */ -#line 153 "Grammar.y" +#line 153 "../IceGrid/Grammar.y" { parser->usage("application", "diff"); ;} break; case 15: - -/* Line 1455 of yacc.c */ -#line 157 "Grammar.y" +#line 157 "../IceGrid/Grammar.y" { parser->updateApplication((yyvsp[(3) - (4)])); ;} break; case 16: - -/* Line 1455 of yacc.c */ -#line 161 "Grammar.y" +#line 161 "../IceGrid/Grammar.y" { parser->usage("application", "update"); ;} break; case 17: - -/* Line 1455 of yacc.c */ -#line 165 "Grammar.y" +#line 165 "../IceGrid/Grammar.y" { parser->describeApplication((yyvsp[(3) - (4)])); ;} break; case 18: - -/* Line 1455 of yacc.c */ -#line 169 "Grammar.y" +#line 169 "../IceGrid/Grammar.y" { parser->usage("application", "describe"); ;} break; case 19: - -/* Line 1455 of yacc.c */ -#line 173 "Grammar.y" +#line 173 "../IceGrid/Grammar.y" { parser->patchApplication((yyvsp[(3) - (4)])); ;} break; case 20: - -/* Line 1455 of yacc.c */ -#line 177 "Grammar.y" +#line 177 "../IceGrid/Grammar.y" { parser->usage("application", "patch"); ;} break; case 21: - -/* Line 1455 of yacc.c */ -#line 181 "Grammar.y" +#line 181 "../IceGrid/Grammar.y" { parser->listAllApplications((yyvsp[(3) - (4)])); ;} break; case 22: - -/* Line 1455 of yacc.c */ -#line 185 "Grammar.y" +#line 185 "../IceGrid/Grammar.y" { parser->usage("application", "list"); ;} break; case 23: - -/* Line 1455 of yacc.c */ -#line 189 "Grammar.y" +#line 189 "../IceGrid/Grammar.y" { parser->describeServerTemplate((yyvsp[(4) - (5)])); ;} break; case 24: - -/* Line 1455 of yacc.c */ -#line 193 "Grammar.y" +#line 193 "../IceGrid/Grammar.y" { parser->usage("server template", "describe"); ;} break; case 25: - -/* Line 1455 of yacc.c */ -#line 197 "Grammar.y" +#line 197 "../IceGrid/Grammar.y" { parser->instantiateServerTemplate((yyvsp[(4) - (5)])); ;} break; case 26: - -/* Line 1455 of yacc.c */ -#line 201 "Grammar.y" +#line 201 "../IceGrid/Grammar.y" { parser->usage("server template", "instantiate"); ;} break; case 27: - -/* Line 1455 of yacc.c */ -#line 205 "Grammar.y" +#line 205 "../IceGrid/Grammar.y" { parser->usage("server template"); ;} break; case 28: - -/* Line 1455 of yacc.c */ -#line 209 "Grammar.y" +#line 209 "../IceGrid/Grammar.y" { parser->describeServiceTemplate((yyvsp[(4) - (5)])); ;} break; case 29: - -/* Line 1455 of yacc.c */ -#line 213 "Grammar.y" +#line 213 "../IceGrid/Grammar.y" { parser->usage("service template", "describe"); ;} break; case 30: - -/* Line 1455 of yacc.c */ -#line 217 "Grammar.y" +#line 217 "../IceGrid/Grammar.y" { parser->usage("service template"); ;} break; case 31: - -/* Line 1455 of yacc.c */ -#line 221 "Grammar.y" +#line 221 "../IceGrid/Grammar.y" { parser->describeNode((yyvsp[(3) - (4)])); ;} break; case 32: - -/* Line 1455 of yacc.c */ -#line 225 "Grammar.y" +#line 225 "../IceGrid/Grammar.y" { parser->usage("node", "describe"); ;} break; case 33: - -/* Line 1455 of yacc.c */ -#line 229 "Grammar.y" +#line 229 "../IceGrid/Grammar.y" { parser->pingNode((yyvsp[(3) - (4)])); ;} break; case 34: - -/* Line 1455 of yacc.c */ -#line 233 "Grammar.y" +#line 233 "../IceGrid/Grammar.y" { parser->usage("node", "ping"); ;} break; case 35: - -/* Line 1455 of yacc.c */ -#line 237 "Grammar.y" +#line 237 "../IceGrid/Grammar.y" { parser->printLoadNode((yyvsp[(3) - (4)])); ;} break; case 36: - -/* Line 1455 of yacc.c */ -#line 241 "Grammar.y" +#line 241 "../IceGrid/Grammar.y" { parser->usage("node", "load"); ;} break; case 37: - -/* Line 1455 of yacc.c */ -#line 245 "Grammar.y" +#line 245 "../IceGrid/Grammar.y" { parser->printNodeProcessorSockets((yyvsp[(3) - (4)])); ;} break; case 38: - -/* Line 1455 of yacc.c */ -#line 249 "Grammar.y" +#line 249 "../IceGrid/Grammar.y" { parser->usage("node", "sockets"); ;} break; case 39: - -/* Line 1455 of yacc.c */ -#line 253 "Grammar.y" +#line 253 "../IceGrid/Grammar.y" { parser->shutdownNode((yyvsp[(3) - (4)])); ;} break; case 40: - -/* Line 1455 of yacc.c */ -#line 257 "Grammar.y" +#line 257 "../IceGrid/Grammar.y" { parser->usage("node", "shutdown"); ;} break; case 41: - -/* Line 1455 of yacc.c */ -#line 261 "Grammar.y" +#line 261 "../IceGrid/Grammar.y" { parser->listAllNodes((yyvsp[(3) - (4)])); ;} break; case 42: - -/* Line 1455 of yacc.c */ -#line 265 "Grammar.y" +#line 265 "../IceGrid/Grammar.y" { parser->usage("node", "list"); ;} break; case 43: - -/* Line 1455 of yacc.c */ -#line 269 "Grammar.y" +#line 269 "../IceGrid/Grammar.y" { parser->show("node", (yyvsp[(3) - (4)])); ;} break; case 44: - -/* Line 1455 of yacc.c */ -#line 273 "Grammar.y" +#line 273 "../IceGrid/Grammar.y" { parser->usage("node", "show"); ;} break; case 45: - -/* Line 1455 of yacc.c */ -#line 277 "Grammar.y" +#line 277 "../IceGrid/Grammar.y" { parser->describeRegistry((yyvsp[(3) - (4)])); ;} break; case 46: - -/* Line 1455 of yacc.c */ -#line 281 "Grammar.y" +#line 281 "../IceGrid/Grammar.y" { parser->usage("registry", "describe"); ;} break; case 47: - -/* Line 1455 of yacc.c */ -#line 285 "Grammar.y" +#line 285 "../IceGrid/Grammar.y" { parser->pingRegistry((yyvsp[(3) - (4)])); ;} break; case 48: - -/* Line 1455 of yacc.c */ -#line 289 "Grammar.y" +#line 289 "../IceGrid/Grammar.y" { parser->usage("registry", "ping"); ;} break; case 49: - -/* Line 1455 of yacc.c */ -#line 293 "Grammar.y" +#line 293 "../IceGrid/Grammar.y" { parser->shutdownRegistry((yyvsp[(3) - (4)])); ;} break; case 50: - -/* Line 1455 of yacc.c */ -#line 297 "Grammar.y" +#line 297 "../IceGrid/Grammar.y" { parser->usage("registry", "shutdown"); ;} break; case 51: - -/* Line 1455 of yacc.c */ -#line 301 "Grammar.y" +#line 301 "../IceGrid/Grammar.y" { parser->listAllRegistries((yyvsp[(3) - (4)])); ;} break; case 52: - -/* Line 1455 of yacc.c */ -#line 305 "Grammar.y" +#line 305 "../IceGrid/Grammar.y" { parser->usage("registry", "list"); ;} break; case 53: - -/* Line 1455 of yacc.c */ -#line 309 "Grammar.y" +#line 309 "../IceGrid/Grammar.y" { parser->show("registry", (yyvsp[(3) - (4)])); ;} break; case 54: - -/* Line 1455 of yacc.c */ -#line 313 "Grammar.y" +#line 313 "../IceGrid/Grammar.y" { parser->usage("registry", "show"); ;} break; case 55: - -/* Line 1455 of yacc.c */ -#line 317 "Grammar.y" +#line 317 "../IceGrid/Grammar.y" { parser->removeServer((yyvsp[(3) - (4)])); ;} break; case 56: - -/* Line 1455 of yacc.c */ -#line 321 "Grammar.y" +#line 321 "../IceGrid/Grammar.y" { parser->usage("server", "remove"); ;} break; case 57: - -/* Line 1455 of yacc.c */ -#line 325 "Grammar.y" +#line 325 "../IceGrid/Grammar.y" { parser->describeServer((yyvsp[(3) - (4)])); ;} break; case 58: - -/* Line 1455 of yacc.c */ -#line 329 "Grammar.y" +#line 329 "../IceGrid/Grammar.y" { parser->usage("server", "describe"); ;} break; case 59: - -/* Line 1455 of yacc.c */ -#line 333 "Grammar.y" +#line 333 "../IceGrid/Grammar.y" { parser->startServer((yyvsp[(3) - (4)])); ;} break; case 60: - -/* Line 1455 of yacc.c */ -#line 337 "Grammar.y" +#line 337 "../IceGrid/Grammar.y" { parser->usage("server", "start"); ;} break; case 61: - -/* Line 1455 of yacc.c */ -#line 341 "Grammar.y" +#line 341 "../IceGrid/Grammar.y" { parser->stopServer((yyvsp[(3) - (4)])); ;} break; case 62: - -/* Line 1455 of yacc.c */ -#line 345 "Grammar.y" +#line 345 "../IceGrid/Grammar.y" { parser->usage("server", "stop"); ;} break; case 63: - -/* Line 1455 of yacc.c */ -#line 349 "Grammar.y" +#line 349 "../IceGrid/Grammar.y" { parser->patchServer((yyvsp[(3) - (4)])); ;} break; case 64: - -/* Line 1455 of yacc.c */ -#line 353 "Grammar.y" +#line 353 "../IceGrid/Grammar.y" { parser->usage("server", "patch"); ;} break; case 65: - -/* Line 1455 of yacc.c */ -#line 357 "Grammar.y" +#line 357 "../IceGrid/Grammar.y" { parser->signalServer((yyvsp[(3) - (4)])); ;} break; case 66: - -/* Line 1455 of yacc.c */ -#line 361 "Grammar.y" +#line 361 "../IceGrid/Grammar.y" { parser->usage("server", "signal"); ;} break; case 67: - -/* Line 1455 of yacc.c */ -#line 365 "Grammar.y" +#line 365 "../IceGrid/Grammar.y" { parser->writeMessage((yyvsp[(3) - (4)]), 1); ;} break; case 68: - -/* Line 1455 of yacc.c */ -#line 369 "Grammar.y" +#line 369 "../IceGrid/Grammar.y" { parser->usage("server", "stdout"); ;} break; case 69: - -/* Line 1455 of yacc.c */ -#line 373 "Grammar.y" +#line 373 "../IceGrid/Grammar.y" { parser->writeMessage((yyvsp[(3) - (4)]), 2); ;} break; case 70: - -/* Line 1455 of yacc.c */ -#line 377 "Grammar.y" +#line 377 "../IceGrid/Grammar.y" { parser->usage("server", "stderr"); ;} break; case 71: - -/* Line 1455 of yacc.c */ -#line 381 "Grammar.y" +#line 381 "../IceGrid/Grammar.y" { parser->stateServer((yyvsp[(3) - (4)])); ;} break; case 72: - -/* Line 1455 of yacc.c */ -#line 385 "Grammar.y" +#line 385 "../IceGrid/Grammar.y" { parser->usage("server", "start"); ;} break; case 73: - -/* Line 1455 of yacc.c */ -#line 389 "Grammar.y" +#line 389 "../IceGrid/Grammar.y" { parser->pidServer((yyvsp[(3) - (4)])); ;} break; case 74: - -/* Line 1455 of yacc.c */ -#line 393 "Grammar.y" +#line 393 "../IceGrid/Grammar.y" { parser->usage("server", "pid"); ;} break; case 75: - -/* Line 1455 of yacc.c */ -#line 397 "Grammar.y" +#line 397 "../IceGrid/Grammar.y" { parser->propertiesServer((yyvsp[(3) - (4)]), false); ;} break; case 76: - -/* Line 1455 of yacc.c */ -#line 401 "Grammar.y" +#line 401 "../IceGrid/Grammar.y" { parser->usage("server", "properties"); ;} break; case 77: - -/* Line 1455 of yacc.c */ -#line 405 "Grammar.y" +#line 405 "../IceGrid/Grammar.y" { parser->propertiesServer((yyvsp[(3) - (4)]), true); ;} break; case 78: - -/* Line 1455 of yacc.c */ -#line 409 "Grammar.y" +#line 409 "../IceGrid/Grammar.y" { parser->usage("server", "property"); ;} break; case 79: - -/* Line 1455 of yacc.c */ -#line 413 "Grammar.y" +#line 413 "../IceGrid/Grammar.y" { parser->enableServer((yyvsp[(3) - (4)]), true); ;} break; case 80: - -/* Line 1455 of yacc.c */ -#line 417 "Grammar.y" +#line 417 "../IceGrid/Grammar.y" { parser->usage("server", "enable"); ;} break; case 81: - -/* Line 1455 of yacc.c */ -#line 421 "Grammar.y" +#line 421 "../IceGrid/Grammar.y" { parser->enableServer((yyvsp[(3) - (4)]), false); ;} break; case 82: - -/* Line 1455 of yacc.c */ -#line 425 "Grammar.y" +#line 425 "../IceGrid/Grammar.y" { parser->usage("server", "disable"); ;} break; case 83: - -/* Line 1455 of yacc.c */ -#line 429 "Grammar.y" +#line 429 "../IceGrid/Grammar.y" { parser->listAllServers((yyvsp[(3) - (4)])); ;} break; case 84: - -/* Line 1455 of yacc.c */ -#line 433 "Grammar.y" +#line 433 "../IceGrid/Grammar.y" { parser->usage("server", "list"); ;} break; case 85: - -/* Line 1455 of yacc.c */ -#line 437 "Grammar.y" +#line 437 "../IceGrid/Grammar.y" { parser->show("server", (yyvsp[(3) - (4)])); ;} break; case 86: - -/* Line 1455 of yacc.c */ -#line 441 "Grammar.y" +#line 441 "../IceGrid/Grammar.y" { parser->usage("server", "show"); ;} break; case 87: - -/* Line 1455 of yacc.c */ -#line 445 "Grammar.y" +#line 445 "../IceGrid/Grammar.y" { parser->startService((yyvsp[(3) - (4)])); ;} break; case 88: - -/* Line 1455 of yacc.c */ -#line 449 "Grammar.y" +#line 449 "../IceGrid/Grammar.y" { parser->usage("service", "start"); ;} break; case 89: - -/* Line 1455 of yacc.c */ -#line 453 "Grammar.y" +#line 453 "../IceGrid/Grammar.y" { parser->stopService((yyvsp[(3) - (4)])); ;} break; case 90: - -/* Line 1455 of yacc.c */ -#line 457 "Grammar.y" +#line 457 "../IceGrid/Grammar.y" { parser->usage("service", "stop"); ;} break; case 91: - -/* Line 1455 of yacc.c */ -#line 461 "Grammar.y" +#line 461 "../IceGrid/Grammar.y" { parser->describeService((yyvsp[(3) - (4)])); ;} break; case 92: - -/* Line 1455 of yacc.c */ -#line 465 "Grammar.y" +#line 465 "../IceGrid/Grammar.y" { parser->usage("service", "describe"); ;} break; case 93: - -/* Line 1455 of yacc.c */ -#line 469 "Grammar.y" +#line 469 "../IceGrid/Grammar.y" { parser->propertiesService((yyvsp[(3) - (4)]), false); ;} break; case 94: - -/* Line 1455 of yacc.c */ -#line 473 "Grammar.y" +#line 473 "../IceGrid/Grammar.y" { parser->usage("service", "properties"); ;} break; case 95: - -/* Line 1455 of yacc.c */ -#line 477 "Grammar.y" +#line 477 "../IceGrid/Grammar.y" { parser->propertiesService((yyvsp[(3) - (4)]), true); ;} break; case 96: - -/* Line 1455 of yacc.c */ -#line 481 "Grammar.y" +#line 481 "../IceGrid/Grammar.y" { parser->usage("service", "property"); ;} break; case 97: - -/* Line 1455 of yacc.c */ -#line 485 "Grammar.y" +#line 485 "../IceGrid/Grammar.y" { parser->listServices((yyvsp[(3) - (4)])); ;} break; case 98: - -/* Line 1455 of yacc.c */ -#line 489 "Grammar.y" +#line 489 "../IceGrid/Grammar.y" { parser->usage("service", "list"); ;} break; case 99: - -/* Line 1455 of yacc.c */ -#line 493 "Grammar.y" +#line 493 "../IceGrid/Grammar.y" { parser->endpointsAdapter((yyvsp[(3) - (4)])); ;} break; case 100: - -/* Line 1455 of yacc.c */ -#line 497 "Grammar.y" +#line 497 "../IceGrid/Grammar.y" { parser->usage("adapter", "endpoints"); ;} break; case 101: - -/* Line 1455 of yacc.c */ -#line 501 "Grammar.y" +#line 501 "../IceGrid/Grammar.y" { parser->removeAdapter((yyvsp[(3) - (4)])); ;} break; case 102: - -/* Line 1455 of yacc.c */ -#line 505 "Grammar.y" +#line 505 "../IceGrid/Grammar.y" { parser->usage("adapter", "remove"); ;} break; case 103: - -/* Line 1455 of yacc.c */ -#line 509 "Grammar.y" +#line 509 "../IceGrid/Grammar.y" { parser->listAllAdapters((yyvsp[(3) - (4)])); ;} break; case 104: - -/* Line 1455 of yacc.c */ -#line 513 "Grammar.y" +#line 513 "../IceGrid/Grammar.y" { parser->usage("adapter", "list"); ;} break; case 105: - -/* Line 1455 of yacc.c */ -#line 517 "Grammar.y" +#line 517 "../IceGrid/Grammar.y" { parser->addObject((yyvsp[(3) - (4)])); ;} break; case 106: - -/* Line 1455 of yacc.c */ -#line 521 "Grammar.y" +#line 521 "../IceGrid/Grammar.y" { parser->usage("object", "add"); ;} break; case 107: - -/* Line 1455 of yacc.c */ -#line 525 "Grammar.y" +#line 525 "../IceGrid/Grammar.y" { parser->removeObject((yyvsp[(3) - (4)])); ;} break; case 108: - -/* Line 1455 of yacc.c */ -#line 529 "Grammar.y" +#line 529 "../IceGrid/Grammar.y" { parser->usage("object", "remove"); ;} break; case 109: - -/* Line 1455 of yacc.c */ -#line 533 "Grammar.y" +#line 533 "../IceGrid/Grammar.y" { parser->findObject((yyvsp[(3) - (4)])); ;} break; case 110: - -/* Line 1455 of yacc.c */ -#line 537 "Grammar.y" +#line 537 "../IceGrid/Grammar.y" { parser->usage("object", "find"); ;} break; case 111: - -/* Line 1455 of yacc.c */ -#line 541 "Grammar.y" +#line 541 "../IceGrid/Grammar.y" { parser->listObject((yyvsp[(3) - (4)])); ;} break; case 112: - -/* Line 1455 of yacc.c */ -#line 545 "Grammar.y" +#line 545 "../IceGrid/Grammar.y" { parser->usage("object", "list"); ;} break; case 113: - -/* Line 1455 of yacc.c */ -#line 549 "Grammar.y" +#line 549 "../IceGrid/Grammar.y" { parser->describeObject((yyvsp[(3) - (4)])); ;} break; case 114: - -/* Line 1455 of yacc.c */ -#line 553 "Grammar.y" +#line 553 "../IceGrid/Grammar.y" { parser->usage("object", "describe"); ;} break; case 115: - -/* Line 1455 of yacc.c */ -#line 557 "Grammar.y" +#line 557 "../IceGrid/Grammar.y" { parser->showCopying(); ;} break; case 116: - -/* Line 1455 of yacc.c */ -#line 561 "Grammar.y" +#line 561 "../IceGrid/Grammar.y" { parser->showWarranty(); ;} break; case 117: - -/* Line 1455 of yacc.c */ -#line 565 "Grammar.y" +#line 565 "../IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (3)]).front()); ;} break; case 118: - -/* Line 1455 of yacc.c */ -#line 569 "Grammar.y" +#line 569 "../IceGrid/Grammar.y" { if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template") { @@ -3214,18 +3016,14 @@ yyreduce: break; case 119: - -/* Line 1455 of yacc.c */ -#line 580 "Grammar.y" +#line 580 "../IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front()); ;} break; case 120: - -/* Line 1455 of yacc.c */ -#line 584 "Grammar.y" +#line 584 "../IceGrid/Grammar.y" { if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template") { @@ -3239,9 +3037,7 @@ yyreduce: break; case 121: - -/* Line 1455 of yacc.c */ -#line 595 "Grammar.y" +#line 595 "../IceGrid/Grammar.y" { if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template") { @@ -3255,36 +3051,28 @@ yyreduce: break; case 122: - -/* Line 1455 of yacc.c */ -#line 606 "Grammar.y" +#line 606 "../IceGrid/Grammar.y" { parser->usage((yyvsp[(2) - (4)]).front()); ;} break; case 123: - -/* Line 1455 of yacc.c */ -#line 610 "Grammar.y" +#line 610 "../IceGrid/Grammar.y" { parser->usage(); ;} break; case 124: - -/* Line 1455 of yacc.c */ -#line 614 "Grammar.y" +#line 614 "../IceGrid/Grammar.y" { parser->usage((yyvsp[(1) - (3)]).front()); ;} break; case 125: - -/* Line 1455 of yacc.c */ -#line 618 "Grammar.y" +#line 618 "../IceGrid/Grammar.y" { (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front()); parser->invalidCommand((yyvsp[(1) - (4)])); @@ -3293,9 +3081,7 @@ yyreduce: break; case 126: - -/* Line 1455 of yacc.c */ -#line 624 "Grammar.y" +#line 624 "../IceGrid/Grammar.y" { parser->invalidCommand((yyvsp[(1) - (3)])); yyerrok; @@ -3303,9 +3089,7 @@ yyreduce: break; case 127: - -/* Line 1455 of yacc.c */ -#line 629 "Grammar.y" +#line 629 "../IceGrid/Grammar.y" { parser->invalidCommand((yyvsp[(1) - (3)])); yyerrok; @@ -3313,26 +3097,20 @@ yyreduce: break; case 128: - -/* Line 1455 of yacc.c */ -#line 634 "Grammar.y" +#line 634 "../IceGrid/Grammar.y" { yyerrok; ;} break; case 129: - -/* Line 1455 of yacc.c */ -#line 638 "Grammar.y" +#line 638 "../IceGrid/Grammar.y" { ;} break; case 130: - -/* Line 1455 of yacc.c */ -#line 647 "Grammar.y" +#line 647 "../IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (2)]); (yyval).push_front((yyvsp[(1) - (2)]).front()); @@ -3340,9 +3118,7 @@ yyreduce: break; case 131: - -/* Line 1455 of yacc.c */ -#line 652 "Grammar.y" +#line 652 "../IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (2)]); (yyval).push_front((yyvsp[(1) - (2)]).front()); @@ -3350,9 +3126,7 @@ yyreduce: break; case 132: - -/* Line 1455 of yacc.c */ -#line 657 "Grammar.y" +#line 657 "../IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (3)]); (yyval).push_front("help"); @@ -3361,9 +3135,7 @@ yyreduce: break; case 133: - -/* Line 1455 of yacc.c */ -#line 663 "Grammar.y" +#line 663 "../IceGrid/Grammar.y" { (yyval) = (yyvsp[(2) - (3)]); (yyval).push_front("help"); @@ -3372,322 +3144,243 @@ yyreduce: break; case 134: - -/* Line 1455 of yacc.c */ -#line 669 "Grammar.y" +#line 669 "../IceGrid/Grammar.y" { (yyval) = YYSTYPE(); ;} break; case 135: - -/* Line 1455 of yacc.c */ -#line 678 "Grammar.y" +#line 678 "../IceGrid/Grammar.y" { ;} break; case 136: - -/* Line 1455 of yacc.c */ -#line 681 "Grammar.y" +#line 681 "../IceGrid/Grammar.y" { ;} break; case 137: - -/* Line 1455 of yacc.c */ -#line 684 "Grammar.y" +#line 684 "../IceGrid/Grammar.y" { ;} break; case 138: - -/* Line 1455 of yacc.c */ -#line 687 "Grammar.y" +#line 687 "../IceGrid/Grammar.y" { ;} break; case 139: - -/* Line 1455 of yacc.c */ -#line 690 "Grammar.y" +#line 690 "../IceGrid/Grammar.y" { ;} break; case 140: - -/* Line 1455 of yacc.c */ -#line 693 "Grammar.y" +#line 693 "../IceGrid/Grammar.y" { ;} break; case 141: - -/* Line 1455 of yacc.c */ -#line 696 "Grammar.y" +#line 696 "../IceGrid/Grammar.y" { ;} break; case 142: - -/* Line 1455 of yacc.c */ -#line 699 "Grammar.y" +#line 699 "../IceGrid/Grammar.y" { ;} break; case 143: - -/* Line 1455 of yacc.c */ -#line 702 "Grammar.y" +#line 702 "../IceGrid/Grammar.y" { ;} break; case 144: - -/* Line 1455 of yacc.c */ -#line 705 "Grammar.y" +#line 705 "../IceGrid/Grammar.y" { ;} break; case 145: - -/* Line 1455 of yacc.c */ -#line 708 "Grammar.y" +#line 708 "../IceGrid/Grammar.y" { ;} break; case 146: - -/* Line 1455 of yacc.c */ -#line 711 "Grammar.y" +#line 711 "../IceGrid/Grammar.y" { ;} break; case 147: - -/* Line 1455 of yacc.c */ -#line 714 "Grammar.y" +#line 714 "../IceGrid/Grammar.y" { ;} break; case 148: - -/* Line 1455 of yacc.c */ -#line 717 "Grammar.y" +#line 717 "../IceGrid/Grammar.y" { ;} break; case 149: - -/* Line 1455 of yacc.c */ -#line 720 "Grammar.y" +#line 720 "../IceGrid/Grammar.y" { ;} break; case 150: - -/* Line 1455 of yacc.c */ -#line 723 "Grammar.y" +#line 723 "../IceGrid/Grammar.y" { ;} break; case 151: - -/* Line 1455 of yacc.c */ -#line 726 "Grammar.y" +#line 726 "../IceGrid/Grammar.y" { ;} break; case 152: - -/* Line 1455 of yacc.c */ -#line 729 "Grammar.y" +#line 729 "../IceGrid/Grammar.y" { ;} break; case 153: - -/* Line 1455 of yacc.c */ -#line 732 "Grammar.y" +#line 732 "../IceGrid/Grammar.y" { ;} break; case 154: - -/* Line 1455 of yacc.c */ -#line 735 "Grammar.y" +#line 735 "../IceGrid/Grammar.y" { ;} break; case 155: - -/* Line 1455 of yacc.c */ -#line 738 "Grammar.y" +#line 738 "../IceGrid/Grammar.y" { ;} break; case 156: - -/* Line 1455 of yacc.c */ -#line 741 "Grammar.y" +#line 741 "../IceGrid/Grammar.y" { ;} break; case 157: - -/* Line 1455 of yacc.c */ -#line 744 "Grammar.y" +#line 744 "../IceGrid/Grammar.y" { ;} break; case 158: - -/* Line 1455 of yacc.c */ -#line 747 "Grammar.y" +#line 747 "../IceGrid/Grammar.y" { ;} break; case 159: - -/* Line 1455 of yacc.c */ -#line 750 "Grammar.y" +#line 750 "../IceGrid/Grammar.y" { ;} break; case 160: - -/* Line 1455 of yacc.c */ -#line 753 "Grammar.y" +#line 753 "../IceGrid/Grammar.y" { ;} break; case 161: - -/* Line 1455 of yacc.c */ -#line 756 "Grammar.y" +#line 756 "../IceGrid/Grammar.y" { ;} break; case 162: - -/* Line 1455 of yacc.c */ -#line 759 "Grammar.y" +#line 759 "../IceGrid/Grammar.y" { ;} break; case 163: - -/* Line 1455 of yacc.c */ -#line 762 "Grammar.y" +#line 762 "../IceGrid/Grammar.y" { ;} break; case 164: - -/* Line 1455 of yacc.c */ -#line 765 "Grammar.y" +#line 765 "../IceGrid/Grammar.y" { ;} break; case 165: - -/* Line 1455 of yacc.c */ -#line 768 "Grammar.y" +#line 768 "../IceGrid/Grammar.y" { ;} break; case 166: - -/* Line 1455 of yacc.c */ -#line 771 "Grammar.y" +#line 771 "../IceGrid/Grammar.y" { ;} break; case 167: - -/* Line 1455 of yacc.c */ -#line 774 "Grammar.y" +#line 774 "../IceGrid/Grammar.y" { ;} break; case 168: - -/* Line 1455 of yacc.c */ -#line 777 "Grammar.y" +#line 777 "../IceGrid/Grammar.y" { ;} break; case 169: - -/* Line 1455 of yacc.c */ -#line 780 "Grammar.y" +#line 780 "../IceGrid/Grammar.y" { ;} break; case 170: - -/* Line 1455 of yacc.c */ -#line 783 "Grammar.y" +#line 783 "../IceGrid/Grammar.y" { ;} break; case 171: - -/* Line 1455 of yacc.c */ -#line 786 "Grammar.y" +#line 786 "../IceGrid/Grammar.y" { ;} break; case 172: - -/* Line 1455 of yacc.c */ -#line 789 "Grammar.y" +#line 789 "../IceGrid/Grammar.y" { ;} break; - -/* Line 1455 of yacc.c */ -#line 3691 "Grammar.tab.c" +/* Line 1267 of yacc.c. */ +#line 3384 "Grammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3698,6 +3391,7 @@ yyreduce: *++yyvsp = yyval; + /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3762,7 +3456,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -3779,7 +3473,7 @@ yyerrlab: } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -3836,6 +3530,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + if (yyn == YYFINAL) + YYACCEPT; + *++yyvsp = yylval; @@ -3860,7 +3557,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#ifndef yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3871,7 +3568,7 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEMPTY) + if (yychar != YYEOF && yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); /* Do not reclaim the symbols of the rule which action triggered diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h index e39828c6ae7..8739da3d8b5 100644 --- a/cpp/src/IceGrid/Grammar.h +++ b/cpp/src/IceGrid/Grammar.h @@ -1,23 +1,24 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -28,11 +29,10 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -81,16 +81,57 @@ ICE_GRID_DISABLE = 297 }; #endif +/* Tokens. */ +#define ICE_GRID_HELP 258 +#define ICE_GRID_EXIT 259 +#define ICE_GRID_APPLICATION 260 +#define ICE_GRID_NODE 261 +#define ICE_GRID_REGISTRY 262 +#define ICE_GRID_SERVER 263 +#define ICE_GRID_ADAPTER 264 +#define ICE_GRID_PING 265 +#define ICE_GRID_LOAD 266 +#define ICE_GRID_SOCKETS 267 +#define ICE_GRID_ADD 268 +#define ICE_GRID_REMOVE 269 +#define ICE_GRID_LIST 270 +#define ICE_GRID_SHUTDOWN 271 +#define ICE_GRID_STRING 272 +#define ICE_GRID_START 273 +#define ICE_GRID_STOP 274 +#define ICE_GRID_PATCH 275 +#define ICE_GRID_SIGNAL 276 +#define ICE_GRID_STDOUT 277 +#define ICE_GRID_STDERR 278 +#define ICE_GRID_DESCRIBE 279 +#define ICE_GRID_PROPERTIES 280 +#define ICE_GRID_PROPERTY 281 +#define ICE_GRID_STATE 282 +#define ICE_GRID_PID 283 +#define ICE_GRID_ENDPOINTS 284 +#define ICE_GRID_ACTIVATION 285 +#define ICE_GRID_OBJECT 286 +#define ICE_GRID_FIND 287 +#define ICE_GRID_SHOW 288 +#define ICE_GRID_COPYING 289 +#define ICE_GRID_WARRANTY 290 +#define ICE_GRID_DIFF 291 +#define ICE_GRID_UPDATE 292 +#define ICE_GRID_INSTANTIATE 293 +#define ICE_GRID_TEMPLATE 294 +#define ICE_GRID_SERVICE 295 +#define ICE_GRID_ENABLE 296 +#define ICE_GRID_DISABLE 297 + #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif - diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index cf9712f56ac..efb2d4397b9 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -107,17 +107,17 @@ SLICE2FREEZECMD := $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS) $(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 -lIceBox \ + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 -lIceBox \ $(LIBS) $(READLINE_LIBS) $(OPENSSL_RPATH_LINK) $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lGlacier2 -lIcePatch2 \ + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lGlacier2 -lIcePatch2 \ -lFreeze -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS) $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \ + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \ -lFreeze -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS) # The slice2freeze rules are structured like this to avoid issues with diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index 915b880167d..3d90ffd2bfb 100644 --- a/cpp/src/IcePatch2/Makefile +++ b/cpp/src/IcePatch2/Makefile @@ -34,15 +34,15 @@ CPPFLAGS := -I. -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) $(BZIP2_FLAGS) $(SERVER): $(SOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) $(CLIENT): $(COBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) $(CALC): $(CALCOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(CALCOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CALCOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS) install:: all $(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index fa934fd6004..c2e13f23f8c 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -87,11 +87,11 @@ $(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) $(ADMIN): $(AOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm $(READLINE_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceStorm $(READLINE_LIBS) $(LIBS) $(MIGRATE): $(MOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStorm -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(MOBJS) -lIceStorm -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index db70c2d80b1..832031d87ef 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -25,7 +25,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index 1e9aa32c9a5..540c8609532 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index d0d6ce059fb..ed26cb5615c 100644 --- a/cpp/src/slice2cs/Makefile +++ b/cpp/src/slice2cs/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index 45e8c4289fa..938b75b50f2 100644 --- a/cpp/src/slice2freeze/Makefile +++ b/cpp/src/slice2freeze/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index 03ea7f62cd5..75709f97478 100644 --- a/cpp/src/slice2freezej/Makefile +++ b/cpp/src/slice2freezej/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile index 4b2128814a0..91daaa61089 100644 --- a/cpp/src/slice2html/Makefile +++ b/cpp/src/slice2html/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index ba97a371ad6..a70c830417a 100644 --- a/cpp/src/slice2java/Makefile +++ b/cpp/src/slice2java/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile index 4dbde860de1..63053c3a533 100644 --- a/cpp/src/slice2js/Makefile +++ b/cpp/src/slice2js/Makefile @@ -25,7 +25,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile index 0d5533355f4..f2a7e6cb7a3 100644 --- a/cpp/src/slice2php/Makefile +++ b/cpp/src/slice2php/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile index edfa1da661c..3f003a08cbe 100644 --- a/cpp/src/slice2py/Makefile +++ b/cpp/src/slice2py/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile index f82518a96db..b8029ca3a86 100644 --- a/cpp/src/slice2rb/Makefile +++ b/cpp/src/slice2rb/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index 73690c8ef91..d24458a470f 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -30,7 +30,7 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 13474e150d1..44c3d73615f 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -32,11 +32,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: -rm -rf db/__catalog db/__catalogIndexList db/Test db/log.* db/__Freeze diff --git a/cpp/test/Freeze/fileLock/Makefile b/cpp/test/Freeze/fileLock/Makefile index 2b4115e7adb..a730f47bc89 100644 --- a/cpp/test/Freeze/fileLock/Makefile +++ b/cpp/test/Freeze/fileLock/Makefile @@ -28,11 +28,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(CLIENTF): $(CFOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(CFOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CFOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile index 17d42555937..952f88b1579 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ b/cpp/test/FreezeScript/dbmap/Makefile @@ -27,7 +27,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) # The slice2freeze rules are structured like this to avoid issues with # parallel make. diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile index bb7f0462ddf..e39e2d505dc 100644 --- a/cpp/test/FreezeScript/evictor/Makefile +++ b/cpp/test/FreezeScript/evictor/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: -rm -rf db/* db_tmp db_check diff --git a/cpp/test/Glacier2/attack/Makefile b/cpp/test/Glacier2/attack/Makefile index d82a3db677c..28c3a7b31de 100644 --- a/cpp/test/Glacier2/attack/Makefile +++ b/cpp/test/Glacier2/attack/Makefile @@ -33,8 +33,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile b/cpp/test/Glacier2/dynamicFiltering/Makefile index 229553b1144..6c969335cb5 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile @@ -34,8 +34,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) diff --git a/cpp/test/Glacier2/override/Makefile b/cpp/test/Glacier2/override/Makefile index 0978c86a989..53ee9bc37ff 100644 --- a/cpp/test/Glacier2/override/Makefile +++ b/cpp/test/Glacier2/override/Makefile @@ -34,8 +34,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/router/Makefile b/cpp/test/Glacier2/router/Makefile index c027a4c2f91..4b63ad8c7aa 100644 --- a/cpp/test/Glacier2/router/Makefile +++ b/cpp/test/Glacier2/router/Makefile @@ -33,8 +33,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/sessionControl/Makefile b/cpp/test/Glacier2/sessionControl/Makefile index 212f6ff8ea3..2c231553567 100644 --- a/cpp/test/Glacier2/sessionControl/Makefile +++ b/cpp/test/Glacier2/sessionControl/Makefile @@ -32,8 +32,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) diff --git a/cpp/test/Glacier2/sessionHelper/Makefile b/cpp/test/Glacier2/sessionHelper/Makefile index 91b3d642052..3ba9547e247 100644 --- a/cpp/test/Glacier2/sessionHelper/Makefile +++ b/cpp/test/Glacier2/sessionHelper/Makefile @@ -31,8 +31,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/ssl/Makefile b/cpp/test/Glacier2/ssl/Makefile index df7dba7ec10..300e3c6f436 100644 --- a/cpp/test/Glacier2/ssl/Makefile +++ b/cpp/test/Glacier2/ssl/Makefile @@ -27,8 +27,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(OBJS) $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS) diff --git a/cpp/test/Glacier2/staticFiltering/Makefile b/cpp/test/Glacier2/staticFiltering/Makefile index 6a06482124f..9edb8d5830c 100644 --- a/cpp/test/Glacier2/staticFiltering/Makefile +++ b/cpp/test/Glacier2/staticFiltering/Makefile @@ -33,11 +33,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f attack.cfg router.cfg server.cfg diff --git a/cpp/test/IceBox/admin/Makefile b/cpp/test/IceBox/admin/Makefile index bc1e2494221..63d15cd8b39 100644 --- a/cpp/test/IceBox/admin/Makefile +++ b/cpp/test/IceBox/admin/Makefile @@ -36,7 +36,7 @@ LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SVCFILENAME): $(SERVICE_OBJS) rm -f $@ diff --git a/cpp/test/IceBox/configuration/Makefile b/cpp/test/IceBox/configuration/Makefile index 85881d66f46..94fa8ab4f20 100644 --- a/cpp/test/IceBox/configuration/Makefile +++ b/cpp/test/IceBox/configuration/Makefile @@ -36,7 +36,7 @@ LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(SVCFILENAME): $(SERVICE_OBJS) rm -f $@ diff --git a/cpp/test/IceGrid/activation/Makefile b/cpp/test/IceGrid/activation/Makefile index 32744ecafc7..4115c90d77f 100644 --- a/cpp/test/IceGrid/activation/Makefile +++ b/cpp/test/IceGrid/activation/Makefile @@ -33,11 +33,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/admin/Makefile.mak b/cpp/test/IceGrid/admin/Makefile.mak index 887ec0c36a2..de3bb0921f8 100644 --- a/cpp/test/IceGrid/admin/Makefile.mak +++ b/cpp/test/IceGrid/admin/Makefile.mak @@ -24,7 +24,7 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif $(SERVER): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) + $(LINK) $(LD_EXEFLAGS) $(LDEXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/allocation/Makefile.mak b/cpp/test/IceGrid/allocation/Makefile.mak index b253d3b17cb..10fc947b28b 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mak +++ b/cpp/test/IceGrid/allocation/Makefile.mak @@ -44,7 +44,7 @@ VPDBFLAGS = /pdb:$(VERIFIER:.exe=.pdb) !endif $(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) + $(LINK) $(LD_EXEFLAGS) $(LDEXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/IceGrid/deployer/Makefile b/cpp/test/IceGrid/deployer/Makefile index fe3b8dad540..0bfb64a2897 100644 --- a/cpp/test/IceGrid/deployer/Makefile +++ b/cpp/test/IceGrid/deployer/Makefile @@ -42,11 +42,11 @@ LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(SVCFILENAME): $(SERVICE_OBJS) rm -f $@ diff --git a/cpp/test/IceGrid/distribution/Makefile b/cpp/test/IceGrid/distribution/Makefile index bb9a7fc5c10..3667d3e4a5f 100644 --- a/cpp/test/IceGrid/distribution/Makefile +++ b/cpp/test/IceGrid/distribution/Makefile @@ -34,11 +34,11 @@ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node db/registry db/node-1 db/node-2 db/replica-* diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile b/cpp/test/IceGrid/noRestartUpdate/Makefile index 463f4a86c82..44ff9826764 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile @@ -42,11 +42,11 @@ LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(SVCFILENAME): $(SERVICE_OBJS) rm -f $@ diff --git a/cpp/test/IceGrid/replicaGroup/Makefile b/cpp/test/IceGrid/replicaGroup/Makefile index 74abfea8ad5..0e0e5848848 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile +++ b/cpp/test/IceGrid/replicaGroup/Makefile @@ -48,11 +48,11 @@ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(SVCFILENAME): $(SERVICE_OBJS) rm -f $@ diff --git a/cpp/test/IceGrid/replication/Makefile b/cpp/test/IceGrid/replication/Makefile index 8573d0f1897..50beeaa30f9 100644 --- a/cpp/test/IceGrid/replication/Makefile +++ b/cpp/test/IceGrid/replication/Makefile @@ -36,11 +36,11 @@ LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile index cbc86e783e7..33c3648b8db 100644 --- a/cpp/test/IceGrid/session/Makefile +++ b/cpp/test/IceGrid/session/Makefile @@ -39,11 +39,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(VERIFIER): $(VOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ diff --git a/cpp/test/IceGrid/simple/Makefile b/cpp/test/IceGrid/simple/Makefile index 33a97c9947e..b9b60c88740 100644 --- a/cpp/test/IceGrid/simple/Makefile +++ b/cpp/test/IceGrid/simple/Makefile @@ -33,11 +33,11 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/update/Makefile b/cpp/test/IceGrid/update/Makefile index 6a243d9ec68..9e6bd9ea385 100644 --- a/cpp/test/IceGrid/update/Makefile +++ b/cpp/test/IceGrid/update/Makefile @@ -36,7 +36,7 @@ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) $(SERVER): $(SOBJS) rm -f $@ diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 130fafe8f95..137c82d3031 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceStorm/federation2/Makefile b/cpp/test/IceStorm/federation2/Makefile index a8bbbae87b3..c9f98c6113b 100644 --- a/cpp/test/IceStorm/federation2/Makefile +++ b/cpp/test/IceStorm/federation2/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceStorm/rep1/Makefile b/cpp/test/IceStorm/rep1/Makefile index 56fdd7bd579..87b841aaf0e 100644 --- a/cpp/test/IceStorm/rep1/Makefile +++ b/cpp/test/IceStorm/rep1/Makefile @@ -37,11 +37,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(SUB): $(SUB_OBJS) rm -f $@ diff --git a/cpp/test/IceStorm/repgrid/Makefile b/cpp/test/IceStorm/repgrid/Makefile index 43080924b9a..36a4697813c 100644 --- a/cpp/test/IceStorm/repgrid/Makefile +++ b/cpp/test/IceStorm/repgrid/Makefile @@ -25,7 +25,7 @@ LIBS := -lIceStorm $(LIBS) $(CLIENT): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceStorm/repstress/Makefile b/cpp/test/IceStorm/repstress/Makefile index c88a161af45..3c9da7ee394 100644 --- a/cpp/test/IceStorm/repstress/Makefile +++ b/cpp/test/IceStorm/repstress/Makefile @@ -38,15 +38,15 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) $(CONTROL): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index be8253c9595..4202097be22 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f build.txt diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile index a8bbbae87b3..c9f98c6113b 100644 --- a/cpp/test/IceStorm/stress/Makefile +++ b/cpp/test/IceStorm/stress/Makefile @@ -32,11 +32,11 @@ LIBS := -lIceStorm $(LIBS) $(PUBLISHER): $(POBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(POBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) $(SUBSCRIBER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) clean:: -rm -f build.txt |