summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-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/IcePack/Makefile6
-rw-r--r--cpp/src/IcePatch2/Makefile6
-rw-r--r--cpp/src/IceStorm/Makefile2
-rw-r--r--cpp/src/icecpp/Makefile2
-rw-r--r--cpp/src/slice2cpp/Makefile2
-rw-r--r--cpp/src/slice2cs/Makefile2
-rw-r--r--cpp/src/slice2docbook/Makefile2
-rw-r--r--cpp/src/slice2freeze/Makefile2
-rw-r--r--cpp/src/slice2freezej/Makefile2
-rw-r--r--cpp/src/slice2java/Makefile2
-rw-r--r--cpp/src/slice2py/Makefile2
-rw-r--r--cpp/src/slice2vb/Makefile2
16 files changed, 24 insertions, 24 deletions
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 5841d5fc1f4..c4174d98a6a 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -55,7 +55,7 @@ clean::
rm -f Scanner.cpp
install:: all
- $(INSTALL_PROGRAM) $(TRANSFORMDB) $(install_bindir)
- $(INSTALL_PROGRAM) $(DUMPDB) $(install_bindir)
+ $(call installprogram,$(TRANSFORMDB),$(install_bindir))
+ $(call installprogram,$(DUMPDB),$(install_bindir))
include .depend
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index 4010e224cc6..826c4a78b45 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -72,6 +72,6 @@ $(ROUTER): $(ROBJS) $(LIBTARGETS)
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
- $(INSTALL_PROGRAM) $(ROUTER) $(install_bindir)
+ $(call installprogram,$(ROUTER),$(install_bindir))
include .depend
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 0603a125d5c..fbd4f1843fe 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -65,7 +65,7 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS)
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
- $(INSTALL_PROGRAM) $(SERVER) $(install_bindir)
- $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir)
+ $(call installprogram,$(SERVER),$(install_bindir))
+ $(call installprogram,$(ADMIN),$(install_bindir))
include .depend
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 084d4061988..4dac91046ae 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -220,8 +220,8 @@ clean::
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
- $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir)
- $(INSTALL_PROGRAM) $(NODE_SERVER) $(install_bindir)
- $(INSTALL_PROGRAM) $(REGISTRY_SERVER) $(install_bindir)
+ $(call installprogram,$(ADMIN),$(install_bindir))
+ $(call installprogram,$(NODE_SERVER),$(install_bindir))
+ $(call installprogram,$(REGISTRY_SERVER),$(install_bindir))
include .depend
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 7b739d9e851..06fe0368312 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -177,8 +177,8 @@ clean::
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
- $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir)
- $(INSTALL_PROGRAM) $(NODE_SERVER) $(install_bindir)
- $(INSTALL_PROGRAM) $(REGISTRY_SERVER) $(install_bindir)
+ $(call installprogram,$(ADMIN),$(install_bindir))
+ $(call installprogram,$(NODE_SERVER),$(install_bindir))
+ $(call installprogram,$(REGISTRY_SERVER),$(install_bindir))
include .depend
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
index c9ac17f6ff6..7b871504f0f 100644
--- a/cpp/src/IcePatch2/Makefile
+++ b/cpp/src/IcePatch2/Makefile
@@ -75,8 +75,8 @@ $(CALC): $(CALCOBJS) $(LIBTARGETS)
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
- $(INSTALL_PROGRAM) $(SERVER) $(install_bindir)
- $(INSTALL_PROGRAM) $(CLIENT) $(install_bindir)
- $(INSTALL_PROGRAM) $(CALC) $(install_bindir)
+ $(call installprogram,$(SERVER),$(install_bindir))
+ $(call installprogram,$(CLIENT),$(install_bindir))
+ $(call installprogram,$(CALC),$(install_bindir))
include .depend
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 5e871c5541c..c9600a03096 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -120,6 +120,6 @@ clean::
install:: all
$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
$(call installlib,$(install_libdir),$(libdir),$(SVCLIBFILENAME),$(SVCSONAME),$(SVCLIBNAME))
- $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir)
+ $(call installprogram,$(ADMIN),$(install_bindir))
include .depend
diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile
index 76eb2e2b379..f3563bf6c89 100644
--- a/cpp/src/icecpp/Makefile
+++ b/cpp/src/icecpp/Makefile
@@ -36,7 +36,7 @@ $(NAME): $(OBJS)
$(CC) -o $@ $(OBJS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
clean::
rm -f cexp.c
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index f51cb8b3bbc..ca7a2de48a4 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -27,6 +27,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index 3a2f4c7ebc8..149dff8d2f7 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -27,6 +27,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index 6292d14ffd8..b3fbba56d81 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -27,6 +27,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index 32800e36021..df51490019d 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -26,6 +26,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index 89b0650f96f..5372bf5dd69 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -26,6 +26,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 14e5e857e52..b3ce2524edc 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -27,6 +27,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index 4da4422aa67..865defdcd67 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -26,6 +26,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend
diff --git a/cpp/src/slice2vb/Makefile b/cpp/src/slice2vb/Makefile
index c8b2f3bf8c8..dcefff6f9b0 100644
--- a/cpp/src/slice2vb/Makefile
+++ b/cpp/src/slice2vb/Makefile
@@ -27,6 +27,6 @@ $(NAME): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS)
install:: all
- $(INSTALL_PROGRAM) $(NAME) $(install_bindir)
+ $(call installprogram,$(NAME),$(install_bindir))
include .depend