diff options
Diffstat (limited to 'cpp')
30 files changed, 6 insertions, 123 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 9ee37012387..4c3ddf842e4 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -154,7 +154,7 @@ SLICE2DOCBOOK = $(ice_dir)\bin$(x64suffix)\slice2docbook.exe EVERYTHING = all clean install
.SUFFIXES:
-.SUFFIXES: .ice .cpp .c .obj
+.SUFFIXES: .ice .cpp .c .obj .res .rc
.cpp.obj::
$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
@@ -172,6 +172,10 @@ EVERYTHING = all clean install del /q $(*F).h $(*F).cpp
$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
+.rc.res:
+ rc $(RCFLAGS) $<
+
+
all:: $(SRCS) $(TARGETS)
!if "$(TARGETS)" != ""
diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak index 7cc8762fc0d..d07a89e6154 100755 --- a/cpp/demo/Ice/MFC/client/Makefile.mak +++ b/cpp/demo/Ice/MFC/client/Makefile.mak @@ -34,9 +34,6 @@ $(CLIENT): $(OBJS) $(COBJS) HelloClient.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-HelloClient.res: HelloClient.rc
- rc.exe HelloClient.rc
-
clean::
del /q Hello.cpp Hello.h
del /q HelloClient.res
diff --git a/cpp/demo/Ice/MFC/server/Makefile.mak b/cpp/demo/Ice/MFC/server/Makefile.mak index b95c788a9a6..7ffb0a405b7 100755 --- a/cpp/demo/Ice/MFC/server/Makefile.mak +++ b/cpp/demo/Ice/MFC/server/Makefile.mak @@ -36,9 +36,6 @@ $(SERVER): $(OBJS) $(COBJS) HelloServer.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-HelloServer.res: HelloServer.rc
- rc.exe HelloServer.rc
-
clean::
del /q Hello.cpp Hello.h
del /q HelloServer.res
diff --git a/cpp/demo/IcePatch2/MFC/Makefile.mak b/cpp/demo/IcePatch2/MFC/Makefile.mak index f967e287449..f6f2f8012f4 100755 --- a/cpp/demo/IcePatch2/MFC/Makefile.mak +++ b/cpp/demo/IcePatch2/MFC/Makefile.mak @@ -34,9 +34,6 @@ $(CLIENT): $(OBJS) $(COBJS) PatchClient.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-PatchClient.res: PatchClient.rc
- rc.exe PatchClient.rc
-
clean::
del /q PatchClient.res
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index 525379f1b91..c95546a8963 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -90,9 +90,6 @@ $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequence clean::
del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
-Freeze.res: Freeze.rc
- rc.exe $(RCFLAGS) Freeze.rc
-
clean::
del /q $(DLLNAME:.dll=.*)
del /q DB.cpp $(HDIR)\DB.h
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index f9568429d49..2eb8fe6fdf6 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -81,12 +81,6 @@ Grammar.cpp Grammar.h: Grammar.y move Grammar.tab.h Grammar.h
del /q Grammar.output
-TransformDB.res: TransformDB.rc
- rc.exe $(RCFLAGS) TransformDB.rc
-
-DumpDB.res: DumpDB.rc
- rc.exe $(RCFLAGS) DumpDB.rc
-
clean::
del /q $(TRANSFORMDB:.exe=.*)
del /q $(DUMPDB:.exe=.*)
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 925f4095a72..1e8955303ef 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -78,12 +78,6 @@ $(ROUTER): $(ROBJS) Glacier2Router.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Glacier2.res: Glacier2.rc
- rc.exe $(RCFLAGS) Glacier2.rc
-
-Glacier2Router.res: Glacier2Router.rc
- rc.exe $(RCFLAGS) Glacier2Router.rc
-
clean::
del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index c9b76d4e984..de12cdae31b 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -150,8 +150,7 @@ EventLoggerI.obj: EventLoggerMsg.h EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
mc EventLoggerMsg.mc
-Ice.res: Ice.rc EventLoggerMsg.rc
- rc.exe $(RCFLAGS) Ice.rc
+Ice.res: EventLoggerMsg.rc
clean::
del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 76aa5f86715..cd2141836e3 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -75,15 +75,6 @@ $(ADMIN): $(AOBJS) IceBoxAdmin.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-IceBox.res: IceBox.rc
- rc.exe $(RCFLAGS) IceBox.rc
-
-IceBoxExe.res: IceBoxExe.rc
- rc.exe $(RCFLAGS) IceBoxExe.rc
-
-IceBoxAdmin.res: IceBoxAdmin.rc
- rc.exe $(RCFLAGS) IceBoxAdmin.rc
-
clean::
del /q IceBox.cpp $(HDIR)\IceBox.h
del /q $(DLLNAME:.dll=.*)
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 0da6279acf5..06366481e71 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -175,15 +175,6 @@ Grammar.cpp Grammar.h: Grammar.y move Grammar.tab.h Grammar.h
del /q Grammar.output
-IceGridAdmin.res: IceGridAdmin.rc
- rc.exe $(RCFLAGS) IceGridAdmin.rc
-
-IceGridNode.res: IceGridNode.rc
- rc.exe $(RCFLAGS) IceGridNode.rc
-
-IceGridRegistry.res: IceGridRegistry.rc
- rc.exe IceGridRegistry.rc
-
clean::
del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index 800510c28d3..f0824971c26 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -56,8 +56,6 @@ $(DLLNAME): $(LIB_OBJS) IceGrid.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-IceGrid.res: IceGrid.rc
- rc.exe $(RCFLAGS) IceGrid.rc
clean::
del /q FileParser.cpp $(HDIR)\FileParser.h
del /q Admin.cpp $(HDIR)\Admin.h
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 9b1d093935f..d0b9570dbac 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -92,18 +92,6 @@ $(CALC): $(CALCOBJS) IcePatch2Calc.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
-IcePatch2.res: IcePatch2.rc
- rc.exe $(RCFLAGS) IcePatch2.rc
-
-IcePatch2Server.res: IcePatch2Server.rc
- rc.exe $(RCFLAGS) IcePatch2Server.rc
-
-IcePatch2Client.res: IcePatch2Client.rc
- rc.exe $(RCFLAGS) IcePatch2Client.rc
-
-IcePatch2Calc.res: IcePatch2Calc.rc
- rc.exe $(RCFLAGS) IcePatch2Calc.rc
-
clean::
del /q FileInfo.cpp $(HDIR)\FileInfo.h
del /q FileServer.cpp $(HDIR)\FileServer.h
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 4ef1afc1bbf..da796435b7a 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -57,9 +57,6 @@ $(DLLNAME): $(OBJS) IceSSL.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-IceSSL.res: IceSSL.rc
- rc.exe $(RCFLAGS) IceSSL.rc
-
clean::
del /q $(DLLNAME:.dll=.*)
del /q IceSSL.res
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index c6baf07b4df..8a4e1f7b821 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -169,18 +169,6 @@ Grammar.cpp Grammar.h: Grammar.y move Grammar.tab.h Grammar.h
del /q Grammar.output
-IceStorm.res: IceStorm.rc
- rc.exe $(RCFLAGS) IceStorm.rc
-
-IceStormService.res: IceStormService.rc
- rc.exe $(RCFLAGS) IceStormService.rc
-
-IceStormAdmin.res: IceStormAdmin.rc
- rc.exe $(RCFLAGS) IceStormAdmin.rc
-
-IceStormMigrate.res: IceStormMigrate.rc
- rc.exe $(RCFLAGS) IceStormMigrate.rc
-
clean::
del /q LLUMap.h LLUMap.cpp
del /q SubscriberMap.h SubscriberMap.cpp
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index 8a40fd66062..56f2d939f4d 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -72,9 +72,6 @@ $(DLLNAME): $(OBJS) IceUtil.res !endif
-IceUtil.res: IceUtil.rc
- rc.exe $(RCFLAGS) IceUtil.rc
-
clean::
del /q $(DLLNAME:.dll=.*)
del /q IceUtil.res
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 9252cce8113..33d56a3ddad 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -43,9 +43,6 @@ $(DLLNAME): $(OBJS) IceXML.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-IceXML.res: IceXML.rc
- rc.exe $(RCFLAGS) IceXML.rc
-
clean::
del /q $(DLLNAME:.dll=.*)
del /q IceXML.res
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index fe7f6db304d..42834358a00 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -80,9 +80,6 @@ Grammar.cpp Grammar.h: Grammar.y move Grammar.tab.h Grammar.h
del /q Grammar.output
-Slice.res: Slice.rc
- rc.exe $(RCFLAGS) Slice.rc
-
clean::
del /q Grammar.cpp Grammar.h
del /q Scanner.cpp
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index a97200a38f0..8d9e10e3231 100755 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -44,10 +44,6 @@ $(TOOL): $(OBJS) IceServiceInstall.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest
-IceServiceInstall.res: IceServiceInstall.rc
- rc.exe $(RCFLAGS) IceServiceInstall.rc
-
-
clean::
del /q $(TOOL:.exe=.*)
del /q IceServiceInstall.res
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index cbcf0fd0368..9cf84234f74 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2Cpp.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Cpp.res: Slice2Cpp.rc
- rc.exe $(RCFLAGS) Slice2Cpp.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Cpp.res
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak index 3680bd5b7d1..50bcfd24857 100644 --- a/cpp/src/slice2cppe/Makefile.mak +++ b/cpp/src/slice2cppe/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2CppE.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2CppE.res: Slice2CppE.rc
- rc.exe $(RCFLAGS) Slice2CppE.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2CppE.res
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index bbb884c5022..5e73ce2dfea 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2Cs.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Cs.res: Slice2Cs.rc
- rc.exe $(RCFLAGS) Slice2Cs.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Cs.res
diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak index 4bffe9bc0c7..c1efe699a76 100644 --- a/cpp/src/slice2docbook/Makefile.mak +++ b/cpp/src/slice2docbook/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2Docbook.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Docbook.res: Slice2Docbook.rc
- rc.exe $(RCFLAGS) Slice2Docbook.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Docbook.res
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index 93b43afba3b..ab93ee151fc 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -37,9 +37,6 @@ $(NAME): $(OBJS) Slice2Freeze.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Freeze.res: Slice2Freeze.rc
- rc.exe $(RCFLAGS) Slice2Freeze.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Freeze.res
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index c5d2fef472a..55b5eae2a3c 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -37,9 +37,6 @@ $(NAME): $(OBJS) Slice2FreezeJ.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2FreezeJ.res: Slice2FreezeJ.rc
- rc.exe $(RCFLAGS) Slice2FreezeJ.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2FreezeJ.res
diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index 75f9a0e680e..be903582ecd 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2Html.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Html.res: Slice2Html.rc
- rc.exe $(RCFLAGS) Slice2Html.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Html.res
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index f4530ae60ce..8dfcacdfc8a 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2Java.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Java.res: Slice2Java.rc
- rc.exe $(RCFLAGS) Slice2Java.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Java.res
diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak index c2674b76c01..d3e0461cb7b 100644 --- a/cpp/src/slice2javae/Makefile.mak +++ b/cpp/src/slice2javae/Makefile.mak @@ -38,9 +38,6 @@ $(NAME): $(OBJS) Slice2JavaE.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2JavaE.res: Slice2JavaE.rc
- rc.exe $(RCFLAGS) Slice2JavaE.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2JavaE.res
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index e0658311397..bf481a2289f 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -37,9 +37,6 @@ $(NAME): $(OBJS) Slice2Py.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Py.res: Slice2Py.rc
- rc.exe $(RCFLAGS) Slice2Py.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Py.res
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index da25cbde75f..434b12f9bc7 100755 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -37,9 +37,6 @@ $(NAME): $(OBJS) Slice2Rb.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Rb.res: Slice2Rb.rc
- rc.exe $(RCFLAGS) Slice2Rb.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Rb.res
diff --git a/cpp/src/slice2sl/Makefile.mak b/cpp/src/slice2sl/Makefile.mak index 819f5c79b41..a0ab2866624 100644 --- a/cpp/src/slice2sl/Makefile.mak +++ b/cpp/src/slice2sl/Makefile.mak @@ -42,9 +42,6 @@ $(NAME): $(OBJS) Slice2Sl.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Slice2Sl.res: Slice2Sl.rc
- rc.exe $(RCFLAGS) Slice2Sl.rc
-
clean::
del /q $(NAME:.exe=.*)
del /q Slice2Sl.res
|