summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2007-02-06 14:31:50 +0000
committerDwayne Boone <dwayne@zeroc.com>2007-02-06 14:31:50 +0000
commit737054467ff892b3bd00d8402fa73263c59a1da4 (patch)
tree7b67bcaf540686afb5e3d88d03608cc4dbfc5748 /cpp
parentFixed uninitialized memory reads reported by purify (diff)
downloadice-737054467ff892b3bd00d8402fa73263c59a1da4.tar.bz2
ice-737054467ff892b3bd00d8402fa73263c59a1da4.tar.xz
ice-737054467ff892b3bd00d8402fa73263c59a1da4.zip
Minor cleanup
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/IceBox/hello/Makefile.mak2
-rw-r--r--cpp/src/Freeze/Makefile.mak2
-rw-r--r--cpp/src/Glacier2/Makefile.mak2
-rw-r--r--cpp/src/Ice/Makefile.mak2
-rw-r--r--cpp/src/IceBox/Makefile.mak2
-rw-r--r--cpp/src/IceGrid/Makefile.mak2
-rw-r--r--cpp/src/IcePatch2/Makefile.mak2
-rw-r--r--cpp/src/IceSSL/Makefile.mak2
-rw-r--r--cpp/src/IceStorm/Makefile.mak10
-rw-r--r--cpp/src/IceUtil/Makefile.mak2
-rw-r--r--cpp/src/IceXML/Makefile.mak2
-rw-r--r--cpp/src/Slice/Makefile.mak2
12 files changed, 16 insertions, 16 deletions
diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak
index 5cb8414a13e..aeafa5b69ae 100644
--- a/cpp/demo/IceBox/hello/Makefile.mak
+++ b/cpp/demo/IceBox/hello/Makefile.mak
@@ -42,7 +42,7 @@ CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
$(LIBNAME) : $(DLLNAME)
$(DLLNAME): $(OBJS) $(SOBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
-if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 67b72e04bcf..66b7d3a7dc8 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -56,7 +56,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak
index 67d1efa0f04..01a40675fb5 100644
--- a/cpp/src/Glacier2/Makefile.mak
+++ b/cpp/src/Glacier2/Makefile.mak
@@ -74,7 +74,7 @@ SLICE2CPPFLAGS = --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLA
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index c44e5a824b0..f9784f8cabe 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -125,7 +125,7 @@ RES_FILE = EventLoggerMsg.res
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) $(RES_FILE)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
index 4b914dd291a..c75ff56436a 100644
--- a/cpp/src/IceBox/Makefile.mak
+++ b/cpp/src/IceBox/Makefile.mak
@@ -63,7 +63,7 @@ APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index 23ba442ed7d..e8c2236e304 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -153,7 +153,7 @@ NPDBFLAGS = /pdb:$(NODE_SERVER:.exe=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(LIB_OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
index 8ad8f5cc637..b4039e82908 100644
--- a/cpp/src/IcePatch2/Makefile.mak
+++ b/cpp/src/IcePatch2/Makefile.mak
@@ -71,7 +71,7 @@ CAPDBFLAGS = /pdb:$(CALC:.exe=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LIBS) $(BZIP2_LIBS) $(OPENSSL_LIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) $(OPENSSL_LIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
index ba3fd9c38b6..98892b917d3 100644
--- a/cpp/src/IceSSL/Makefile.mak
+++ b/cpp/src/IceSSL/Makefile.mak
@@ -45,7 +45,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index dbf9278231d..b6e41c4c0e7 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -80,24 +80,24 @@ APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
- -if exist $(DLLNAME).manifest \
+ -if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
-if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
$(SVCLIBNAME): $(SVCDLLNAME)
$(SVCDLLNAME): $(SERVICE_OBJS)
- $(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) $(PREOUT)$(SVCDLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME)
- -if exist $(SVCDLLNAME).manifest \
+ -if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
-if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp)
$(ADMIN): $(AOBJS)
$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
- -if exist $(ADMIN).manifest \
+ -if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest
..\IceStorm\PersistentTopicMap.h PersistentTopicMap.cpp: ..\IceStorm\LinkRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
index cc756e82be9..9579827cd2c 100644
--- a/cpp/src/IceUtil/Makefile.mak
+++ b/cpp/src/IceUtil/Makefile.mak
@@ -50,7 +50,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(ICE_OS_LIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(ICE_OS_LIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 409cbddb4bc..d138e111154 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -31,7 +31,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index cc81fd4ee6b..7a5b2311864 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -40,7 +40,7 @@ PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
$(LIBNAME): $(DLLNAME)
$(DLLNAME): $(OBJS)
- $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(BASELIBS)
+ $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS)
move $(DLLNAME:.dll=.lib) $(LIBNAME)
-if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 22:41:16 +0000