diff options
author | Jose <jose@zeroc.com> | 2013-01-30 19:32:48 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2013-01-30 19:32:48 +0100 |
commit | 431858c0383347b2ab91d2f55adeeca7d598eb1f (patch) | |
tree | 9b77e53e9765af30f505067b105e6c720c7852e5 /cpp/src | |
parent | ICE-5091 - Remove Java configuration from demo/IceGrid/secure (diff) | |
download | ice-431858c0383347b2ab91d2f55adeeca7d598eb1f.tar.bz2 ice-431858c0383347b2ab91d2f55adeeca7d598eb1f.tar.xz ice-431858c0383347b2ab91d2f55adeeca7d598eb1f.zip |
Added C++11 libraries/binaries to OS X binary distribution
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/FreezeScript/Makefile | 4 | ||||
-rw-r--r-- | cpp/src/Glacier2/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/IceBox/Makefile | 4 | ||||
-rw-r--r-- | cpp/src/IceGrid/Makefile | 6 | ||||
-rw-r--r-- | cpp/src/IcePatch2/Makefile | 6 | ||||
-rw-r--r-- | cpp/src/IceStorm/FreezeDB/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/ca/Makefile | 4 | ||||
-rw-r--r-- | cpp/src/slice2confluence/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2cs/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2freeze/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2freezej/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2html/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2java/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2php/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2py/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2rb/Makefile | 2 |
18 files changed, 25 insertions, 25 deletions
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index b64c57e8118..55cab10a8a2 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -9,8 +9,8 @@ top_srcdir = ../.. -TRANSFORMDB = $(top_srcdir)/bin/transformdb -DUMPDB = $(top_srcdir)/bin/dumpdb +TRANSFORMDB = $(bindir)/transformdb +DUMPDB = $(bindir)/dumpdb TARGETS = $(TRANSFORMDB) $(DUMPDB) diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile index 610885c5045..54d695202b3 100644 --- a/cpp/src/Glacier2/Makefile +++ b/cpp/src/Glacier2/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -ROUTER = $(top_srcdir)/bin/glacier2router +ROUTER = $(bindir)/glacier2router TARGETS = $(ROUTER) OBJS = Blobject.o \ diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index 41384624dd0..9039c7a0c52 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -13,8 +13,8 @@ LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) SONAME = $(call mksoname,IceBox,$(SOVERSION)) LIBNAME = $(call mklibname,IceBox) -SERVER = $(top_srcdir)/bin/icebox -ADMIN = $(top_srcdir)/bin/iceboxadmin +SERVER = $(bindir)/icebox +ADMIN = $(bindir)/iceboxadmin LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN) diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index b4593c58dfd..49fc81d4ae6 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -9,9 +9,9 @@ top_srcdir = ../.. -ADMIN = $(top_srcdir)/bin/icegridadmin -NODE_SERVER = $(top_srcdir)/bin/icegridnode -REGISTRY_SERVER = $(top_srcdir)/bin/icegridregistry +ADMIN = $(bindir)/icegridadmin +NODE_SERVER = $(bindir)/icegridnode +REGISTRY_SERVER = $(bindir)/icegridregistry TARGETS = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index f5a2680f4c6..1af3f6a3f96 100644 --- a/cpp/src/IcePatch2/Makefile +++ b/cpp/src/IcePatch2/Makefile @@ -9,9 +9,9 @@ top_srcdir = ../.. -SERVER = $(top_srcdir)/bin/icepatch2server -CLIENT = $(top_srcdir)/bin/icepatch2client -CALC = $(top_srcdir)/bin/icepatch2calc +SERVER = $(bindir)/icepatch2server +CLIENT = $(bindir)/icepatch2client +CALC = $(bindir)/icepatch2calc TARGETS = $(SERVER) $(CLIENT) $(CALC) diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile index 853db781e8e..a40b8b060b8 100644 --- a/cpp/src/IceStorm/FreezeDB/Makefile +++ b/cpp/src/IceStorm/FreezeDB/Makefile @@ -13,7 +13,7 @@ LIBFILENAME = $(call mklibfilename,IceStormFreezeDB,$(VERSION)) SONAME = $(call mksoname,IceStormFreezeDB,$(SOVERSION)) LIBNAME = $(call mklibname,IceStormFreezeDB) -MIGRATE = $(top_srcdir)/bin/icestormmigrate +MIGRATE = $(bindir)/icestormmigrate TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) $(MIGRATE) diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index af2b258aae2..486feda466c 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -13,7 +13,7 @@ LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) SONAME = $(call mksoname,IceStormService,$(SOVERSION)) LIBNAME = $(call mklibname,IceStormService) -ADMIN = $(top_srcdir)/bin/icestormadmin +ADMIN = $(bindir)/icestormadmin LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) TARGETS = $(LIBTARGETS) $(ADMIN) diff --git a/cpp/src/ca/Makefile b/cpp/src/ca/Makefile index e4696729241..a1eda45b738 100644 --- a/cpp/src/ca/Makefile +++ b/cpp/src/ca/Makefile @@ -13,12 +13,12 @@ CA_FILES = iceca CLASS_FILES = ImportKey.class -TARGETS = $(top_srcdir)/bin/iceca \ +TARGETS = $(bindir)/iceca \ $(top_srcdir)/lib/ImportKey.class include $(top_srcdir)/config/Make.rules -$(top_srcdir)/bin/iceca: iceca +$(bindir)/iceca: iceca cp iceca $@ $(top_srcdir)/lib/ImportKey.class: ImportKey.class diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index bf617791faa..9f208b78d42 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2confluence +NAME = $(bindir)/slice2confluence TARGETS = $(NAME) diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index 85df19ac217..23878a96552 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2cpp$(EXE_EXT) +NAME = $(bindir)/slice2cpp$(EXE_EXT) TARGETS = $(NAME) diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index 594b421e61c..80fe27c260d 100644 --- a/cpp/src/slice2cs/Makefile +++ b/cpp/src/slice2cs/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2cs +NAME = $(bindir)/slice2cs TARGETS = $(NAME) diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index 38750f627e0..fd2bbf3d914 100644 --- a/cpp/src/slice2freeze/Makefile +++ b/cpp/src/slice2freeze/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2freeze +NAME = $(bindir)/slice2freeze TARGETS = $(NAME) diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index a65bda333a8..cd08aef06fb 100644 --- a/cpp/src/slice2freezej/Makefile +++ b/cpp/src/slice2freezej/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2freezej +NAME = $(bindir)/slice2freezej TARGETS = $(NAME) diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile index 2caeaa9a23e..db66645c7e6 100644 --- a/cpp/src/slice2html/Makefile +++ b/cpp/src/slice2html/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2html +NAME = $(bindir)/slice2html TARGETS = $(NAME) diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index c39eb6c9375..e21e18b0d27 100644 --- a/cpp/src/slice2java/Makefile +++ b/cpp/src/slice2java/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2java +NAME = $(bindir)/slice2java TARGETS = $(NAME) diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile index 0610db0ffc6..a897e731637 100644 --- a/cpp/src/slice2php/Makefile +++ b/cpp/src/slice2php/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2php +NAME = $(bindir)/slice2php TARGETS = $(NAME) diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile index 1a549ecbdd1..caff4973fe4 100644 --- a/cpp/src/slice2py/Makefile +++ b/cpp/src/slice2py/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2py +NAME = $(bindir)/slice2py TARGETS = $(NAME) diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile index ea0104d1bec..7e91e778da1 100644 --- a/cpp/src/slice2rb/Makefile +++ b/cpp/src/slice2rb/Makefile @@ -9,7 +9,7 @@ top_srcdir = ../.. -NAME = $(top_srcdir)/bin/slice2rb$(EXE_EXT) +NAME = $(bindir)/slice2rb$(EXE_EXT) TARGETS = $(NAME) |