diff options
Diffstat (limited to 'cpp/src')
26 files changed, 53 insertions, 130 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index c95546a8963..e8b5862909d 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -110,20 +110,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 2eb8fe6fdf6..a58eb0b03c9 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -92,15 +92,14 @@ install:: all copy $(TRANSFORMDB) $(install_bindir)
copy $(DUMPDB) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(TRANSFORMDB:.exe=.tds) $(install_bindir)
copy $(DUMPDB:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(TRANSFORMDB:.exe=.pdb) $(install_bindir)
@@ -108,6 +107,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 1e8955303ef..f1fb5146154 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -95,15 +95,14 @@ install:: all copy $(DLLNAME) $(install_bindir)
copy $(ROUTER) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
copy $(ROUTER:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
@@ -111,6 +110,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index de12cdae31b..86800d9d74b 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -194,20 +194,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index cd2141836e3..d985985b60b 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -88,16 +88,15 @@ install:: all copy $(SERVER) $(install_bindir)
copy $(ADMIN) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
copy $(SERVER:.exe=.tds) $(install_bindir)
copy $(ADMIN:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
@@ -106,6 +105,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 06366481e71..83b05677bea 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -196,16 +196,15 @@ install:: all copy $(NODE_SERVER) $(install_bindir)
copy $(REGISTRY_SERVER) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(ADMIN:.exe=.tds) $(install_bindir)
copy $(NODE_SERVER:.exe=.tds) $(install_bindir)
copy $(REGISTRY_SERVER:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(ADMIN:.exe=.pdb) $(install_bindir)
@@ -214,6 +213,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index ec45bcc4c0c..bb65912f7ab 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -74,20 +74,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index d0b9570dbac..6bc42a78449 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -108,9 +108,8 @@ install:: all copy $(CLIENT) $(install_bindir)
copy $(CALC) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
@@ -118,7 +117,7 @@ install:: all copy $(CLIENT:.exe=.tds) $(install_bindir)
copy $(CALC:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
@@ -128,6 +127,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index da796435b7a..39c83062e33 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -65,20 +65,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 8a4e1f7b821..9f9108ccfd0 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -200,9 +200,8 @@ install:: all copy $(ADMIN) $(install_bindir)
copy $(MIGRATE) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
@@ -210,7 +209,7 @@ install:: all copy $(ADMIN:.exe=.tds) $(install_bindir)
copy $(MIGRATE:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
@@ -220,6 +219,4 @@ install:: all !endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index 56f2d939f4d..9aeb96e3332 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -80,20 +80,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 33d56a3ddad..4d68cc64ece 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -51,20 +51,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index 42834358a00..58bcb71be62 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -90,20 +90,17 @@ install:: all copy $(LIBNAME) $(install_libdir)
copy $(DLLNAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(DLLNAME:.dll=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(DLLNAME:.dll=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index 8d9e10e3231..233c732289b 100644 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -51,22 +51,19 @@ clean:: install:: all
copy $(TOOL) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(TOOL:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(TOOL:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index 9cf84234f74..fb9a69e62c0 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak index 50bcfd24857..40d52ace566 100644 --- a/cpp/src/slice2cppe/Makefile.mak +++ b/cpp/src/slice2cppe/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index 5e73ce2dfea..f9f72b8e5e2 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak index c1efe699a76..eaa1edf0015 100644 --- a/cpp/src/slice2docbook/Makefile.mak +++ b/cpp/src/slice2docbook/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index ab93ee151fc..0799679ada2 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -44,20 +44,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index 55b5eae2a3c..9d7dc99cec0 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -44,20 +44,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index be903582ecd..9f1bd789fc1 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index 8dfcacdfc8a..89e6f17751c 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak index d3e0461cb7b..17f1a5d603d 100644 --- a/cpp/src/slice2javae/Makefile.mak +++ b/cpp/src/slice2javae/Makefile.mak @@ -45,20 +45,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index bf481a2289f..b31812043df 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -44,20 +44,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index 434b12f9bc7..0de8e886a72 100644 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -44,20 +44,17 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
diff --git a/cpp/src/slice2sl/Makefile.mak b/cpp/src/slice2sl/Makefile.mak index a0ab2866624..c67d131a3a2 100644 --- a/cpp/src/slice2sl/Makefile.mak +++ b/cpp/src/slice2sl/Makefile.mak @@ -49,20 +49,18 @@ clean:: install:: all
copy $(NAME) $(install_bindir)
-!if "$(OPTIMIZE)" != "yes"
-!if "$(CPP_COMPILER)" == "BCC2007"
+
+!if "$(CPP_COMPILER)" == "BCC2007" && "$(OPTIMIZE)" != "yes"
install:: all
copy $(NAME:.exe=.tds) $(install_bindir)
-!else
+!elseif "$(GENERATE_PDB)" == "yes"
install:: all
copy $(NAME:.exe=.pdb) $(install_bindir)
!endif
-!endif
-
!include .depend
|