summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-30 19:32:48 +0100
committerJose <jose@zeroc.com>2013-01-30 19:32:48 +0100
commit431858c0383347b2ab91d2f55adeeca7d598eb1f (patch)
tree9b77e53e9765af30f505067b105e6c720c7852e5 /cpp
parentICE-5091 - Remove Java configuration from demo/IceGrid/secure (diff)
downloadice-431858c0383347b2ab91d2f55adeeca7d598eb1f.tar.bz2
ice-431858c0383347b2ab91d2f55adeeca7d598eb1f.tar.xz
ice-431858c0383347b2ab91d2f55adeeca7d598eb1f.zip
Added C++11 libraries/binaries to OS X binary distribution
Diffstat (limited to 'cpp')
-rw-r--r--cpp/bin/c++11/.gitignore1
-rw-r--r--cpp/config/Make.rules32
-rw-r--r--cpp/config/Make.rules.Darwin3
-rw-r--r--cpp/lib/c++11/.gitignore1
-rw-r--r--cpp/src/FreezeScript/Makefile4
-rw-r--r--cpp/src/Glacier2/Makefile2
-rw-r--r--cpp/src/IceBox/Makefile4
-rw-r--r--cpp/src/IceGrid/Makefile6
-rw-r--r--cpp/src/IcePatch2/Makefile6
-rw-r--r--cpp/src/IceStorm/FreezeDB/Makefile2
-rw-r--r--cpp/src/IceStorm/Makefile2
-rw-r--r--cpp/src/ca/Makefile4
-rw-r--r--cpp/src/slice2confluence/Makefile2
-rw-r--r--cpp/src/slice2cpp/Makefile2
-rw-r--r--cpp/src/slice2cs/Makefile2
-rw-r--r--cpp/src/slice2freeze/Makefile2
-rw-r--r--cpp/src/slice2freezej/Makefile2
-rw-r--r--cpp/src/slice2html/Makefile2
-rw-r--r--cpp/src/slice2java/Makefile2
-rw-r--r--cpp/src/slice2php/Makefile2
-rw-r--r--cpp/src/slice2py/Makefile2
-rw-r--r--cpp/src/slice2rb/Makefile2
22 files changed, 44 insertions, 43 deletions
diff --git a/cpp/bin/c++11/.gitignore b/cpp/bin/c++11/.gitignore
new file mode 100644
index 00000000000..39af5887579
--- /dev/null
+++ b/cpp/bin/c++11/.gitignore
@@ -0,0 +1 @@
+# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index f3e35be7b44..83c9b68191d 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -161,8 +161,8 @@ else
include $(top_srcdir)/../config/Make.common.rules
endif
-bindir = $(top_srcdir)/bin
-libdir = $(top_srcdir)/lib
+bindir = $(top_srcdir)/bin$(cpp11suffix)
+libdir = $(top_srcdir)/lib$(cpp11suffix)
headerdir = $(top_srcdir)/include
#
@@ -198,56 +198,56 @@ endif
OPENSSL_FLAGS += $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include)
ifeq ($(OPENSSL_LIBS),)
- OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto
+ OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(tp_libsubdir)) -lssl -lcrypto
endif
-OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir)))
+OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(tp_libsubdir)))
BZIP2_FLAGS = $(if $(BZIP2_HOME),-I$(BZIP2_HOME)/include)
ifeq ($(BZIP2_LIBS),)
- BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
+ BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(tp_libsubdir)) -lbz2
endif
-BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
+BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(tp_libsubdir)))
ifeq ($(ICONV_LIBS),)
- ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
+ ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(tp_libsubdir)) $(ICONV_LIB)
endif
ifneq ($(DB_HOME),)
DB_FLAGS = -I$(DB_HOME)/include
ifeq ($(DB_LIBS),)
- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx$(CPP11LIBSUFFIX)
+ DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
endif
DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
else
ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
DB_FLAGS = -I/usr/include/db53
- DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx$(CPP11LIBSUFFIX)
+ DB_LIBS = -L/usr/$(tp_libsubdir)/db53 -ldb_cxx
else
ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
DB_FLAGS = -I/usr/local/include/db53
- DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx$(CPP11LIBSUFFIX)
+ DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
else
- DB_LIBS = -ldb_cxx$(CPP11LIBSUFFIX)
+ DB_LIBS = -ldb_cxx
endif
endif
endif
EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
ifeq ($(EXPAT_LIBS),)
- EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
+ EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(tp_libsubdir)) -lexpat
endif
-EXPAT_RPATH_LINK = $(if $(EXPAT_HOME),$(call rpathlink,$(EXPAT_HOME)/$(libsubdir)))
+EXPAT_RPATH_LINK = $(if $(EXPAT_HOME),$(call rpathlink,$(EXPAT_HOME)/$(tp_libsubdir)))
ifeq ($(MCPP_LIBS),)
- MCPP_LIBS = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp
+ MCPP_LIBS = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(tp_libsubdir)) -lmcpp
endif
-MCPP_RPATH_LINK = $(if $(MCPP_HOME),$(call rpathlink,$(MCPP_HOME)/$(libsubdir)))
+MCPP_RPATH_LINK = $(if $(MCPP_HOME),$(call rpathlink,$(MCPP_HOME)/$(tp_libsubdir)))
ifeq ($(PLATFORM_HAS_READLINE),yes)
ifeq ($(USE_READLINE),yes)
READLINE_FLAGS = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
- READLINE_LIBS = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses
+ READLINE_LIBS = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(tp_libsubdir)) -lreadline -lncurses
endif
endif
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 2bddfd9e689..928c60140d6 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -11,7 +11,7 @@
# This file is included by Make.rules when uname is Darwin.
#
-CXX ?= xcrun clang++
+CXX = xcrun clang++
CXXFLAGS = -Wall -Werror -D_REENTRANT
@@ -31,7 +31,6 @@ ifeq ($(CPP11), yes)
ifeq ($(CXX), xcrun clang++)
CPPFLAGS += --std=c++11
CXXFLAGS += --stdlib=libc++
- CPP11LIBSUFFIX = -c++11
endif
endif
diff --git a/cpp/lib/c++11/.gitignore b/cpp/lib/c++11/.gitignore
new file mode 100644
index 00000000000..39af5887579
--- /dev/null
+++ b/cpp/lib/c++11/.gitignore
@@ -0,0 +1 @@
+# Dummy file, so that git retains this otherwise empty directory.
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)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:50:12 +0000