diff options
Diffstat (limited to 'cpp')
81 files changed, 685 insertions, 683 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Makefile b/cpp/demo/Database/Oracle/occi/Makefile index 1d5c9848878..b3cc886bd94 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile +++ b/cpp/demo/Database/Oracle/occi/Makefile @@ -21,13 +21,13 @@ OBJS = HR.o COBJS = Client.o SOBJS = DbTypes.o \ - DbTypesMap.o \ - DeptFactoryI.o \ - DeptI.o \ - EmpI.o \ - OCCIServantLocator.o \ - Server.o \ - Util.o + DbTypesMap.o \ + DeptFactoryI.o \ + DeptI.o \ + EmpI.o \ + OCCIServantLocator.o \ + Server.o \ + Util.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak index a9fb2415445..c938c80b57e 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile.mak +++ b/cpp/demo/Database/Oracle/occi/Makefile.mak @@ -21,13 +21,13 @@ OBJS = HR.obj COBJS = Client.obj SOBJS = DbTypes.obj \ - DbTypesMap.obj \ - DeptFactoryI.obj \ - DeptI.obj \ - EmpI.obj \ - OCCIServantLocator.obj \ - Server.obj \ - Util.obj + DbTypesMap.obj \ + DeptFactoryI.obj \ + DeptI.obj \ + EmpI.obj \ + OCCIServantLocator.obj \ + Server.obj \ + Util.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ @@ -67,12 +67,12 @@ ORACLE_LIBS = $(ORACLE_LIBS) -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc" oci.lib $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \ diff --git a/cpp/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile index 5639d81d90c..2cfaba5eebd 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile +++ b/cpp/demo/Database/Oracle/proc/Makefile @@ -16,12 +16,12 @@ TARGETS = $(CLIENT) $(SERVER) SLICE_SRCS = HR.ice -PROC_SRCS = CurrentSqlContext.pc \ - Util.pc \ - EmpI.pc \ - DeptI.pc \ - DeptFactoryI.pc \ - Server.pc +PROC_SRCS = CurrentSqlContext.pc \ + DeptFactoryI.pc \ + DeptI.pc \ + EmpI.pc \ + Server.pc \ + Util.pc OBJS = HR.o @@ -39,9 +39,9 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I$(ORACLE_HOME)/precomp/public -DSQLCA_NONE $(CPPFLAGS) -GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp) +GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp) -ORACLE_LIBS = -L$(ORACLE_HOME)/lib -lclntsh +ORACLE_LIBS = -L$(ORACLE_HOME)/lib -lclntsh .SUFFIXES: .SUFFIXES: .pc .cpp .c .o diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak index af90c1321eb..b9910b9c98a 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile.mak +++ b/cpp/demo/Database/Oracle/proc/Makefile.mak @@ -14,12 +14,12 @@ SERVER = server.exe TARGETS = $(CLIENT) $(SERVER) -PROC_SRCS = CurrentSqlContext.pc \ - Util.pc \ - EmpI.pc \ - DeptI.pc \ - DeptFactoryI.pc \ - Server.pc +PROC_SRCS = CurrentSqlContext.pc \ + DeptFactoryI.pc \ + DeptI.pc \ + EmpI.pc \ + Server.pc \ + Util.pc OBJS = HR.obj @@ -35,7 +35,7 @@ SRCS = $(OBJS:.obj=.cpp) \ CPPFLAGS = -I. -I"$(ORACLE_HOME)\precomp\public" -DSQLCA_NONE $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp) +GENERATED_PROC_FILES = $(PROC_SRCS:.pc=.cpp) # # Change to orasql10.lib if you're linking with Oracle 10 @@ -56,12 +56,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q HR.cpp HR.h diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index 559183487cc..ad36be6c0cc 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -13,7 +13,7 @@ CLIENT = client TARGETS = $(CLIENT) -OBJS = Client.o BenchTypes.o Test.o +OBJS = BenchTypes.o Client.o Test.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak index 7e7731166e6..ba691827417 100644 --- a/cpp/demo/Freeze/bench/Makefile.mak +++ b/cpp/demo/Freeze/bench/Makefile.mak @@ -13,7 +13,7 @@ CLIENT = client.exe TARGETS = $(CLIENT) -OBJS = Client.obj BenchTypes.obj Test.obj +OBJS = BenchTypes.obj Client.obj Test.obj SRCS = $(OBJS:.obj=.cpp) diff --git a/cpp/demo/Freeze/casino/Makefile b/cpp/demo/Freeze/casino/Makefile index c0102c31494..8362336da7c 100644 --- a/cpp/demo/Freeze/casino/Makefile +++ b/cpp/demo/Freeze/casino/Makefile @@ -18,11 +18,11 @@ OBJS = Casino.o COBJS = Client.o \ -SOBJS = CasinoStore.o \ - BankI.o \ - BetI.o \ - PlayerI.o \ - BetResolver.o \ +SOBJS = BankI.o \ + BetI.o \ + BetResolver.o \ + CasinoStore.o \ + PlayerI.o \ Server.o diff --git a/cpp/demo/Freeze/casino/Makefile.mak b/cpp/demo/Freeze/casino/Makefile.mak index c1726579bc5..642e523c961 100644 --- a/cpp/demo/Freeze/casino/Makefile.mak +++ b/cpp/demo/Freeze/casino/Makefile.mak @@ -18,11 +18,11 @@ OBJS = Casino.obj COBJS = Client.obj \ -SOBJS = CasinoStore.obj \ - BankI.obj \ - BetI.obj \ - PlayerI.obj \ - BetResolver.obj \ +SOBJS = BankI.obj \ + BetI.obj \ + BetResolver.obj \ + CasinoStore.obj \ + PlayerI.obj \ Server.obj SRCS = $(OBJS:.obj=.cpp) \ @@ -42,12 +42,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q Casino.cpp Casino.h diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile index f45cdaacdde..e5811661b54 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile +++ b/cpp/demo/Freeze/customEvictor/Makefile @@ -14,22 +14,22 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -OBJS = Item.o +OBJS = Item.o COBJS = Client.o -SOBJS = ItemInfo.o \ - Database.o \ - CurrentDatabase.o \ - ItemI.o \ - Evictor.o \ - EvictorBase.o \ - SimpleEvictor.o \ - Server.o +SOBJS = CurrentDatabase.o \ + Database.o \ + Evictor.o \ + EvictorBase.o \ + ItemI.o \ + ItemInfo.o \ + Server.o \ + SimpleEvictor.o SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) + $(COBJS:.o=.cpp) \ + $(SOBJS:.o=.cpp) SLICE_SRCS = Item.ice ItemInfo.ice diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mak b/cpp/demo/Freeze/customEvictor/Makefile.mak index 4f2ab8357cb..b6155eea1fb 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile.mak +++ b/cpp/demo/Freeze/customEvictor/Makefile.mak @@ -18,18 +18,18 @@ OBJS = Item.obj COBJS = Client.obj -SOBJS = ItemInfo.obj \ - Database.obj \ - CurrentDatabase.obj \ - ItemI.obj \ - Evictor.obj \ - EvictorBase.obj \ - SimpleEvictor.obj \ - Server.obj +SOBJS = CurrentDatabase.obj \ + Database.obj \ + Evictor.obj \ + EvictorBase.obj \ + ItemI.obj \ + ItemInfo.obj \ + Server.obj \ + SimpleEvictor.obj SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) + $(COBJS:.obj=.cpp) \ + $(SOBJS:.obj=.cpp) SLICE_SRCS = Item.ice ItemInfo.ice @@ -46,12 +46,12 @@ COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest Database.h Database.cpp: ItemInfo.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" del /q Database.h Database.cpp diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index 78055bd4d82..0992e47b1fc 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -17,25 +17,25 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) OBJS = Library.o -COBJS = Grammar.o \ - Scanner.o \ +COBJS = Client.o \ + Grammar.o \ Parser.o \ RunParser.o \ - Client.o \ + Scanner.o -SOBJS = LibraryI.o \ +SOBJS = BookFactory.o \ + LibraryI.o \ LibraryTypes.o \ - BookFactory.o \ Server.o -COLOBJS = Grammar.o \ - Scanner.o \ - Parser.o \ - RunParser.o \ +COLOBJS = BookFactory.o \ + Collocated.o \ + Grammar.o \ LibraryI.o \ LibraryTypes.o \ - BookFactory.o \ - Collocated.o + Parser.o \ + RunParser.o \ + Scanner.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index f93981df767..11de0a7bee7 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -17,25 +17,25 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) OBJS = Library.obj -COBJS = Grammar.obj \ - Scanner.obj \ +COBJS = Client.obj \ + Grammar.obj \ Parser.obj \ RunParser.obj \ - Client.obj \ + Scanner.obj -SOBJS = LibraryI.obj \ +SOBJS = BookFactory.obj \ + LibraryI.obj \ LibraryTypes.obj \ - BookFactory.obj \ Server.obj -COLOBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ +COLOBJS = BookFactory.obj \ + Collocated.obj \ + Grammar.obj \ LibraryI.obj \ LibraryTypes.obj \ - BookFactory.obj \ - Collocated.obj + Parser.obj \ + RunParser.obj \ + Scanner.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index fc770e8a85d..eefe766c61e 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -18,25 +18,25 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) OBJS = PhoneBook.o -COBJS = Grammar.o \ - Scanner.o \ +COBJS = Client.o \ + Grammar.o \ Parser.o \ RunParser.o \ - Client.o \ + Scanner.o -SOBJS = PhoneBookI.o \ - ContactFactory.o \ - NameIndex.o \ +SOBJS = ContactFactory.o \ + NameIndex.o \ + PhoneBookI.o \ Server.o -COLOBJS = Grammar.o \ - Scanner.o \ +COLOBJS = Collocated.o \ + ContactFactory.o \ + Grammar.o \ + NameIndex.o \ Parser.o \ - RunParser.o \ PhoneBookI.o \ - ContactFactory.o \ - NameIndex.o \ - Collocated.o + RunParser.o \ + Scanner.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index 345917a0984..e6210462f18 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -17,25 +17,25 @@ TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) OBJS = PhoneBook.obj -COBJS = Grammar.obj \ - Scanner.obj \ +COBJS = Client.obj \ + Grammar.obj \ Parser.obj \ RunParser.obj \ - Client.obj \ + Scanner.obj -SOBJS = PhoneBookI.obj \ - ContactFactory.obj \ +SOBJS = ContactFactory.obj \ NameIndex.obj \ + PhoneBookI.obj \ Server.obj -COLOBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - RunParser.obj \ - PhoneBookI.obj \ +COLOBJS = Collocated.obj \ ContactFactory.obj \ + Grammar.obj \ NameIndex.obj \ - Collocated.obj + Parser.obj \ + PhoneBookI.obj \ + RunParser.obj \ + Scanner.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Glacier2/chat/Makefile b/cpp/demo/Glacier2/chat/Makefile index 608c02b62c5..5c8f6225e5e 100644 --- a/cpp/demo/Glacier2/chat/Makefile +++ b/cpp/demo/Glacier2/chat/Makefile @@ -18,8 +18,8 @@ OBJS = Chat.o COBJS = Client.o -SOBJS = Server.o \ - ChatSessionI.o +SOBJS = ChatSessionI.o \ + Server.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak index 5e4dbf8590c..5f22e05720a 100644 --- a/cpp/demo/Glacier2/chat/Makefile.mak +++ b/cpp/demo/Glacier2/chat/Makefile.mak @@ -18,8 +18,8 @@ OBJS = Chat.obj COBJS = Client.obj -SOBJS = Server.obj \ - ChatSessionI.obj +SOBJS = ChatSessionI.obj \ + Server.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Ice/bidir/Makefile b/cpp/demo/Ice/bidir/Makefile index 38fdea038f4..c6de83f2669 100644 --- a/cpp/demo/Ice/bidir/Makefile +++ b/cpp/demo/Ice/bidir/Makefile @@ -18,8 +18,8 @@ OBJS = Callback.o COBJS = Client.o -SOBJS = Server.o \ - CallbackI.o +SOBJS = CallbackI.o \ + Server.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Ice/callback/Makefile b/cpp/demo/Ice/callback/Makefile index a6e04e23e64..cf758fd23c9 100644 --- a/cpp/demo/Ice/callback/Makefile +++ b/cpp/demo/Ice/callback/Makefile @@ -18,8 +18,8 @@ OBJS = Callback.o COBJS = Client.o -SOBJS = Server.o \ - CallbackSenderI.o +SOBJS = CallbackSenderI.o \ + Server.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Ice/converter/Makefile b/cpp/demo/Ice/converter/Makefile index 3b724a84445..2d1886245c0 100644 --- a/cpp/demo/Ice/converter/Makefile +++ b/cpp/demo/Ice/converter/Makefile @@ -18,9 +18,9 @@ TARGETS = $(CLIENT1) $(CLIENT2) $(SERVER) OBJS = Greet.o C1OBJS = Client.o \ - StringConverterI.o \ - ClientWithConverter.o - + ClientWithConverter.o \ + StringConverterI.o + C2OBJS = Client.o \ ClientWithoutConverter.o @@ -40,7 +40,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(CLIENT1): $(OBJS) $(C1OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(C1OBJS) $(LIBS) - + $(CLIENT2): $(OBJS) $(C2OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(C2OBJS) $(LIBS) diff --git a/cpp/demo/Ice/converter/Makefile.mak b/cpp/demo/Ice/converter/Makefile.mak index 101bd807310..f738eedbcd2 100644 --- a/cpp/demo/Ice/converter/Makefile.mak +++ b/cpp/demo/Ice/converter/Makefile.mak @@ -18,12 +18,13 @@ TARGETS = $(CLIENT1) $(CLIENT2) $(SERVER) OBJS = Greet.obj C1OBJS = Client.obj \ - StringConverterI.obj \ - ClientWithConverter.obj + ClientWithConverter.obj \ + StringConverterI.obj + C2OBJS = Client.obj \ ClientWithoutConverter.obj - + SOBJS = GreetI.obj \ Server.obj diff --git a/cpp/demo/Ice/interleaved/Makefile b/cpp/demo/Ice/interleaved/Makefile index 50fa2427a7b..27e0f331ed5 100755 --- a/cpp/demo/Ice/interleaved/Makefile +++ b/cpp/demo/Ice/interleaved/Makefile @@ -18,8 +18,8 @@ OBJS = Throughput.o COBJS = Client.o -SOBJS = ThroughputI.o \ - Server.o +SOBJS = Server.o \ + ThroughputI.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ @@ -30,7 +30,7 @@ SLICE_SRCS = Throughput.ice include $(top_srcdir)/config/Make.rules ifeq ($(CXX),aCC) -# +# # Work-around 'quadrant warning' in aCC A.03.56 # Puts string literals in read-write memory # diff --git a/cpp/demo/Ice/interleaved/Makefile.mak b/cpp/demo/Ice/interleaved/Makefile.mak index 10e68cc5e8d..7f5e0c726b0 100644 --- a/cpp/demo/Ice/interleaved/Makefile.mak +++ b/cpp/demo/Ice/interleaved/Makefile.mak @@ -18,8 +18,9 @@ OBJS = Throughput.obj COBJS = Client.obj -SOBJS = ThroughputI.obj \ - Server.obj +SOBJS = Server.obj \ + ThroughputI.obj + SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Ice/multicast/Makefile b/cpp/demo/Ice/multicast/Makefile index 893f1795671..81e0454de1a 100644 --- a/cpp/demo/Ice/multicast/Makefile +++ b/cpp/demo/Ice/multicast/Makefile @@ -14,8 +14,8 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -OBJS = Hello.o \ - Discovery.o +OBJS = Discovery.o \ + Hello.o COBJS = Client.o diff --git a/cpp/demo/Ice/multicast/Makefile.mak b/cpp/demo/Ice/multicast/Makefile.mak index 0f1ed9fc2b0..3c2ecfc50de 100644 --- a/cpp/demo/Ice/multicast/Makefile.mak +++ b/cpp/demo/Ice/multicast/Makefile.mak @@ -14,8 +14,8 @@ SERVER = server.exe TARGETS = $(CLIENT) $(SERVER) -OBJS = Hello.obj \ - Discovery.obj +OBJS = Discovery.obj \ + Hello.obj COBJS = Client.obj diff --git a/cpp/demo/Ice/nrvo/Makefile b/cpp/demo/Ice/nrvo/Makefile index a99bda7a3e9..faca950b4f0 100644 --- a/cpp/demo/Ice/nrvo/Makefile +++ b/cpp/demo/Ice/nrvo/Makefile @@ -14,8 +14,8 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -OBJS = Nrvo.o \ - MyStringSeq.o +OBJS = MyStringSeq.o \ + Nrvo.o COBJS = Client.o diff --git a/cpp/demo/Ice/nrvo/Makefile.mak b/cpp/demo/Ice/nrvo/Makefile.mak index 9955fce7fc9..aa3c53c8792 100644 --- a/cpp/demo/Ice/nrvo/Makefile.mak +++ b/cpp/demo/Ice/nrvo/Makefile.mak @@ -14,8 +14,8 @@ SERVER = server.exe TARGETS = $(CLIENT) $(SERVER) -OBJS = Nrvo.obj \ - MyStringSeq.obj +OBJS = MyStringSeq.obj \ + Nrvo.obj COBJS = Client.obj diff --git a/cpp/demo/Ice/session/Makefile b/cpp/demo/Ice/session/Makefile index 743a667a94e..406359d5dec 100644 --- a/cpp/demo/Ice/session/Makefile +++ b/cpp/demo/Ice/session/Makefile @@ -19,9 +19,9 @@ OBJS = Session.o COBJS = Client.o SOBJS = ReapTask.o \ + Server.o \ SessionFactoryI.o \ - SessionI.o \ - Server.o + SessionI.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/Ice/session/Makefile.mak b/cpp/demo/Ice/session/Makefile.mak index e35adef4130..18087b07e7c 100644 --- a/cpp/demo/Ice/session/Makefile.mak +++ b/cpp/demo/Ice/session/Makefile.mak @@ -19,9 +19,9 @@ OBJS = Session.obj COBJS = Client.obj SOBJS = ReapTask.obj \ + Server.obj \ SessionFactoryI.obj \ - SessionI.obj \ - Server.obj + SessionI.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile index 50fa2427a7b..27e0f331ed5 100644 --- a/cpp/demo/Ice/throughput/Makefile +++ b/cpp/demo/Ice/throughput/Makefile @@ -18,8 +18,8 @@ OBJS = Throughput.o COBJS = Client.o -SOBJS = ThroughputI.o \ - Server.o +SOBJS = Server.o \ + ThroughputI.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ @@ -30,7 +30,7 @@ SLICE_SRCS = Throughput.ice include $(top_srcdir)/config/Make.rules ifeq ($(CXX),aCC) -# +# # Work-around 'quadrant warning' in aCC A.03.56 # Puts string literals in read-write memory # diff --git a/cpp/demo/Ice/throughput/Makefile.mak b/cpp/demo/Ice/throughput/Makefile.mak index 10e68cc5e8d..abbf5c5ca76 100644 --- a/cpp/demo/Ice/throughput/Makefile.mak +++ b/cpp/demo/Ice/throughput/Makefile.mak @@ -18,8 +18,8 @@ OBJS = Throughput.obj COBJS = Client.obj -SOBJS = ThroughputI.obj \ - Server.obj +SOBJS = Server.obj \ + ThroughputI.obj \ SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/Ice/value/Makefile b/cpp/demo/Ice/value/Makefile index 3d64bc1f458..805bb918902 100644 --- a/cpp/demo/Ice/value/Makefile +++ b/cpp/demo/Ice/value/Makefile @@ -14,9 +14,9 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -OBJS = Value.o \ - ValueI.o \ - ObjectFactory.o +OBJS = ObjectFactory.o \ + Value.o \ + ValueI.o COBJS = Client.o \ diff --git a/cpp/demo/Ice/value/Makefile.mak b/cpp/demo/Ice/value/Makefile.mak index 76e05ca5195..723188b3e11 100644 --- a/cpp/demo/Ice/value/Makefile.mak +++ b/cpp/demo/Ice/value/Makefile.mak @@ -14,9 +14,9 @@ SERVER = server.exe TARGETS = $(CLIENT) $(SERVER) -OBJS = Value.obj \ - ValueI.obj \ - ObjectFactory.obj +OBJS = ObjectFactory.obj \ + Value.obj \ + ValueI.obj COBJS = Client.obj @@ -38,12 +38,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q Value.cpp Value.h diff --git a/cpp/demo/IceGrid/secure/Makefile b/cpp/demo/IceGrid/secure/Makefile index 18db74c8c17..84bcdc59300 100644 --- a/cpp/demo/IceGrid/secure/Makefile +++ b/cpp/demo/IceGrid/secure/Makefile @@ -23,7 +23,7 @@ SOBJS = HelloI.o \ SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ + $(SOBJS:.o=.cpp) SLICE_SRCS = Hello.ice diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile b/cpp/demo/IceGrid/sessionActivation/Makefile index d8c6dc140b9..92ee4cda5e6 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile +++ b/cpp/demo/IceGrid/sessionActivation/Makefile @@ -23,7 +23,7 @@ SOBJS = HelloI.o \ SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ + $(SOBJS:.o=.cpp) SLICE_SRCS = Hello.ice diff --git a/cpp/demo/IceGrid/simple/Makefile b/cpp/demo/IceGrid/simple/Makefile index d8c6dc140b9..92ee4cda5e6 100644 --- a/cpp/demo/IceGrid/simple/Makefile +++ b/cpp/demo/IceGrid/simple/Makefile @@ -23,7 +23,7 @@ SOBJS = HelloI.o \ SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ + $(SOBJS:.o=.cpp) SLICE_SRCS = Hello.ice diff --git a/cpp/demo/IceStorm/counter/Makefile b/cpp/demo/IceStorm/counter/Makefile index 033e8ff8806..3f43bae0b4f 100644 --- a/cpp/demo/IceStorm/counter/Makefile +++ b/cpp/demo/IceStorm/counter/Makefile @@ -19,8 +19,8 @@ OBJS = Counter.o COBJS = Client.o \ CounterObserverI.o -SOBJS = Server.o \ - CounterI.o +SOBJS = CounterI.o \ + Server.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index db9400bd4b7..46cbcda5178 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -19,8 +19,8 @@ OBJS = Counter.obj COBJS = Client.obj \ CounterObserverI.obj -SOBJS = Server.obj \ - CounterI.obj +SOBJS = CounterI.obj \ + Server.obj SRCS = $(OBJS:.obj=.cpp) \ $(COBJS:.obj=.cpp) \ diff --git a/cpp/demo/book/evictor_filesystem/Makefile b/cpp/demo/book/evictor_filesystem/Makefile index d6bb730c28c..a0a441af754 100644 --- a/cpp/demo/book/evictor_filesystem/Makefile +++ b/cpp/demo/book/evictor_filesystem/Makefile @@ -16,9 +16,9 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.o -COBJS = Client.o \ - Parser.o \ +COBJS = Client.o \ Grammar.o \ + Parser.o \ Scanner.o SOBJS = PersistentFilesystem.o \ diff --git a/cpp/demo/book/evictor_filesystem/Makefile.mak b/cpp/demo/book/evictor_filesystem/Makefile.mak index 706983d10a8..990dcca080a 100644 --- a/cpp/demo/book/evictor_filesystem/Makefile.mak +++ b/cpp/demo/book/evictor_filesystem/Makefile.mak @@ -16,10 +16,10 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.obj -COBJS = Scanner.obj \ +COBJS = Client.obj \ Grammar.obj \ Parser.obj \ - Client.obj + Scanner.obj SOBJS = PersistentFilesystem.obj \ PersistentFilesystemI.obj \ diff --git a/cpp/demo/book/lifecycle/Makefile b/cpp/demo/book/lifecycle/Makefile index e8c24e7b8be..c225cfcc83c 100644 --- a/cpp/demo/book/lifecycle/Makefile +++ b/cpp/demo/book/lifecycle/Makefile @@ -16,10 +16,10 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.o -COBJS = Grammar.o \ - Scanner.o \ +COBJS = Client.o \ + Grammar.o \ Parser.o \ - Client.o \ + Scanner.o SOBJS = FilesystemI.o \ Server.o diff --git a/cpp/demo/book/lifecycle/Makefile.mak b/cpp/demo/book/lifecycle/Makefile.mak index 8057547aae8..b8f4a412e13 100644 --- a/cpp/demo/book/lifecycle/Makefile.mak +++ b/cpp/demo/book/lifecycle/Makefile.mak @@ -16,10 +16,10 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.obj -COBJS = Scanner.obj \ - Grammar.obj \ - Parser.obj \ - Client.obj +COBJS = Client.obj \ + Grammar.obj \ + Parser.obj \ + Scanner.obj SOBJS = FilesystemI.obj \ Server.obj diff --git a/cpp/demo/book/map_filesystem/Makefile b/cpp/demo/book/map_filesystem/Makefile index 38c6a88cec0..22e47b0931d 100644 --- a/cpp/demo/book/map_filesystem/Makefile +++ b/cpp/demo/book/map_filesystem/Makefile @@ -17,14 +17,14 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.o COBJS = Client.o \ - Parser.o \ Grammar.o \ + Parser.o \ Scanner.o SOBJS = FilesystemDB.o \ - IdentityFileEntryMap.o \ - IdentityDirectoryEntryMap.o \ FilesystemI.o \ + IdentityDirectoryEntryMap.o \ + IdentityFileEntryMap.o \ Server.o SRCS = $(OBJS:.o=.cpp) \ diff --git a/cpp/demo/book/map_filesystem/Makefile.mak b/cpp/demo/book/map_filesystem/Makefile.mak index 58c10cd9ded..5d18cdc2d06 100644 --- a/cpp/demo/book/map_filesystem/Makefile.mak +++ b/cpp/demo/book/map_filesystem/Makefile.mak @@ -16,15 +16,15 @@ TARGETS = $(CLIENT) $(SERVER) OBJS = Filesystem.obj -COBJS = Scanner.obj \ +COBJS = Client.obj \ Grammar.obj \ Parser.obj \ - Client.obj + Scanner.obj SOBJS = FilesystemDB.obj \ - IdentityFileEntryMap.obj \ - IdentityDirectoryEntryMap.obj \ FilesystemI.obj \ + IdentityDirectoryEntryMap.obj \ + IdentityFileEntryMap.obj \ Server.obj SRCS = $(OBJS:.obj=.cpp) \ diff --git a/cpp/demo/book/simple_filesystem/Makefile b/cpp/demo/book/simple_filesystem/Makefile index 9dda54f43e3..8649ecfa3d7 100644 --- a/cpp/demo/book/simple_filesystem/Makefile +++ b/cpp/demo/book/simple_filesystem/Makefile @@ -20,8 +20,8 @@ OBJS = Filesystem.o COBJS = Client.o -SOBJS = Server.o \ - FilesystemI.o +SOBJS = FilesystemI.o \ + Server.o SRCS = $(OBJS:.o=.cpp) \ $(COBJS:.o=.cpp) \ diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 050ce56a2e8..06a649e9493 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -10,52 +10,52 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,Freeze,$(VERSION)) -SONAME = $(call mksoname,Freeze,$(SOVERSION)) +SONAME = $(call mksoname,Freeze,$(SOVERSION)) LIBNAME = $(call mklibname,Freeze) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = BackgroundSaveEvictor.o \ - BackgroundSaveEvictorI.o \ - CatalogData.o \ - Catalog.o \ - CatalogIndexList.o \ +OBJS = BackgroundSaveEvictor.o \ + BackgroundSaveEvictorI.o \ + Catalog.o \ + CatalogData.o \ + CatalogIndexList.o \ + Connection.o \ ConnectionI.o \ - Connection.o \ DB.o \ - EvictorI.o \ - EvictorIteratorI.o \ - EvictorStorage.o \ Evictor.o \ - Exception.o \ - IndexI.o \ - Index.o \ - MapDb.o \ - MapI.o \ - ObjectStore.o \ + EvictorI.o \ + EvictorIteratorI.o \ + EvictorStorage.o \ + Exception.o \ + Index.o \ + IndexI.o \ + MapDb.o \ + MapI.o \ + ObjectStore.o \ PingObject.o \ - SharedDbEnv.o \ - TransactionalEvictor.o \ - TransactionalEvictorI.o \ - TransactionalEvictorContext.o \ - TransactionHolder.o \ - TransactionI.o \ - Transaction.o \ - Util.o + SharedDbEnv.o \ + Transaction.o \ + TransactionalEvictor.o \ + TransactionalEvictorContext.o \ + TransactionalEvictorI.o \ + TransactionHolder.o \ + TransactionI.o \ + Util.o SRCS = $(OBJS:.o=.cpp) -SLICE_SRCS = $(SDIR)/BackgroundSaveEvictor.ice \ - $(SDIR)/DB.ice \ - $(SDIR)/CatalogData.ice \ - $(SDIR)/Connection.ice \ - $(SDIR)/ConnectionF.ice \ - $(SDIR)/Exception.ice \ +SLICE_SRCS = $(SDIR)/BackgroundSaveEvictor.ice \ + $(SDIR)/CatalogData.ice \ + $(SDIR)/Connection.ice \ + $(SDIR)/ConnectionF.ice \ + $(SDIR)/DB.ice \ + $(SDIR)/Evictor.ice \ $(SDIR)/EvictorF.ice \ $(SDIR)/EvictorStorage.ice \ - $(SDIR)/Evictor.ice \ - $(SDIR)/TransactionalEvictor.ice \ - $(SDIR)/Transaction.ice \ + $(SDIR)/Exception.ice \ + $(SDIR)/Transaction.ice \ + $(SDIR)/TransactionalEvictor.ice \ ../Freeze/PingObject.ice HDIR = $(headerdir)/Freeze @@ -63,7 +63,7 @@ SDIR = $(slicedir)/Freeze include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_LIBS) diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index 86024d96818..0ac39387b2b 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -15,32 +15,32 @@ DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) OBJS = BackgroundSaveEvictor.obj \ - BackgroundSaveEvictorI.obj \ - CatalogData.obj \ - Catalog.obj \ - CatalogIndexList.obj \ - ConnectionI.obj \ - Connection.obj \ + BackgroundSaveEvictorI.obj \ + Catalog.obj \ + CatalogData.obj \ + CatalogIndexList.obj \ + Connection.obj \ + ConnectionI.obj \ DB.obj \ - EvictorI.obj \ - EvictorIteratorI.obj \ Evictor.obj \ + EvictorI.obj \ + EvictorIteratorI.obj \ EvictorStorage.obj \ - Exception.obj \ - IndexI.obj \ - Index.obj \ - MapDb.obj \ - MapI.obj \ - ObjectStore.obj \ + Exception.obj \ + Index.obj \ + IndexI.obj \ + MapDb.obj \ + MapI.obj \ + ObjectStore.obj \ PingObject.obj \ - SharedDbEnv.obj \ - TransactionalEvictor.obj \ - TransactionalEvictorI.obj \ - TransactionalEvictorContext.obj \ - TransactionHolder.obj \ - TransactionI.obj \ - Transaction.obj \ - Util.obj + SharedDbEnv.obj \ + Transaction.obj \ + TransactionalEvictor.obj \ + TransactionalEvictorContext.obj \ + TransactionalEvictorI.obj \ + TransactionHolder.obj \ + TransactionI.obj \ + Util.obj SRCS = $(OBJS:.obj=.cpp) @@ -65,7 +65,7 @@ $(DLLNAME): $(OBJS) Freeze.res $(LINK) $(BASE):0x25000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) @@ -87,7 +87,7 @@ clean:: -del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h -del /q CatalogData.cpp $(HDIR)\CatalogData.h -del /q Connection.cpp $(HDIR)\Connection.h - -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h + -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h -del /q Exception.cpp $(HDIR)\Exception.h -del /q EvictorF.cpp $(HDIR)\EvictorF.h -del /q Evictor.cpp $(HDIR)\Evictor.h diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 3cc09914229..f2ce096b149 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -14,18 +14,18 @@ DUMPDB = $(bindir)/dumpdb TARGETS = $(TRANSFORMDB) $(DUMPDB) -COMMON_OBJS = ../FreezeScript/Grammar.o \ - Scanner.o \ - AssignVisitor.o \ +COMMON_OBJS = AssignVisitor.o \ Data.o \ Error.o \ - Functions.o \ Exception.o \ + Functions.o \ Parser.o \ Print.o \ - Util.o + Scanner.o \ + Util.o \ + ../FreezeScript/Grammar.o -TRANSFORM_OBJS = TransformAnalyzer.o \ +TRANSFORM_OBJS = TransformAnalyzer.o \ TransformVisitor.o \ Transformer.o \ transformdb.o @@ -45,7 +45,7 @@ endif include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS) BISONFLAGS := --name-prefix "freeze_script_" $(BISONFLAGS) $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 3b0265270b9..87096a0e33f 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -25,7 +25,7 @@ COMMON_OBJS = Grammar.obj \ Print.obj \ Util.obj -TRANSFORM_OBJS = TransformAnalyzer.obj \ +TRANSFORM_OBJS = TransformAnalyzer.obj \ TransformVisitor.obj \ Transformer.obj \ transformdb.obj diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile index 9d34515b9a1..39c0474ff7e 100644 --- a/cpp/src/Glacier2/Makefile +++ b/cpp/src/Glacier2/Makefile @@ -12,8 +12,10 @@ top_srcdir = ../.. ROUTER = $(bindir)/glacier2router TARGETS = $(ROUTER) -OBJS = Blobject.o \ +OBJS = Blobject.o \ ClientBlobject.o \ + FilterI.o \ + FilterManager.o \ Glacier2Router.o \ Instance.o \ Instrumentation.o \ @@ -22,8 +24,6 @@ OBJS = Blobject.o \ RequestQueue.o \ RouterI.o \ RoutingTable.o \ - FilterI.o \ - FilterManager.o \ ServerBlobject.o \ SessionRouterI.o diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index f89f7360abc..e8a8bfe38eb 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -14,16 +14,16 @@ TARGETS = $(ROUTER) OBJS = Blobject.obj \ ClientBlobject.obj \ + FilterI.obj \ + FilterManager.obj \ Glacier2Router.obj \ Instance.obj \ - Instrumentation.obj \ - InstrumentationI.obj \ + Instrumentation.obj \ + InstrumentationI.obj \ ProxyVerifier.obj \ RequestQueue.obj \ RouterI.obj \ RoutingTable.obj \ - FilterI.obj \ - FilterManager.obj \ ServerBlobject.obj \ SessionRouterI.obj diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index b677f71e74a..a90b429be36 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -9,20 +9,20 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,Glacier2,$(VERSION)) -SONAME = $(call mksoname,Glacier2,$(SOVERSION)) +LIBFILENAME = $(call mklibfilename,Glacier2,$(VERSION)) +SONAME = $(call mksoname,Glacier2,$(SOVERSION)) LIBNAME = $(call mklibname,Glacier2) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = PermissionsVerifier.o \ +OBJS = Application.o \ + CryptPermissionsVerifierPlugin.o \ + Metrics.o \ + PermissionsVerifier.o \ Router.o \ - SSLInfo.o \ Session.o \ - Application.o \ - Metrics.o \ SessionHelper.o \ - CryptPermissionsVerifierPlugin.o + SSLInfo.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak index f693360cacd..5e0504fbcf2 100644 --- a/cpp/src/Glacier2Lib/Makefile.mak +++ b/cpp/src/Glacier2Lib/Makefile.mak @@ -12,16 +12,16 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\glacier2$(LIBSUFFIX).lib DLLNAME = $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll -TARGETS = $(LIBNAME) $(DLLNAME) +TARGETS = $(LIBNAME) $(DLLNAME) -OBJS = PermissionsVerifier.obj \ +OBJS = Application.obj \ + CryptPermissionsVerifierPlugin.obj \ + Metrics.obj \ + PermissionsVerifier.obj \ Router.obj \ - SSLInfo.obj \ Session.obj \ - Application.obj \ - Metrics.obj \ SessionHelper.obj \ - CryptPermissionsVerifierPlugin.obj + SSLInfo.obj SRCS = $(OBJS:.obj=.cpp) diff --git a/cpp/src/Glacier2Lib/winrt/Makefile.mak b/cpp/src/Glacier2Lib/winrt/Makefile.mak index 06daf84ceb9..b39345218d8 100644 --- a/cpp/src/Glacier2Lib/winrt/Makefile.mak +++ b/cpp/src/Glacier2Lib/winrt/Makefile.mak @@ -14,12 +14,12 @@ SOURCE_DIR = .. TARGETS = $(LIBNAME) -OBJS = $(ARCH)\$(CONFIG)\PermissionsVerifier.obj \ +OBJS = $(ARCH)\$(CONFIG)\Metrics.obj \ + $(ARCH)\$(CONFIG)\PermissionsVerifier.obj \ $(ARCH)\$(CONFIG)\Router.obj \ - $(ARCH)\$(CONFIG)\SSLInfo.obj \ $(ARCH)\$(CONFIG)\Session.obj \ $(ARCH)\$(CONFIG)\SessionHelper.obj \ - $(ARCH)\$(CONFIG)\Metrics.obj + $(ARCH)\$(CONFIG)\SSLInfo.obj SRCS = $(OBJS:.obj=.cpp) SRCS = $(SRCS:x86\=) @@ -34,13 +34,13 @@ SRCS = $(SRCS) \ HDIR = $(headerdir)\Glacier2 SDIR = $(slicedir)\Glacier2 -SLICE_SRCS = $(SDIR)/PermissionsVerifierF.ice \ +SLICE_SRCS = $(SDIR)/Metrics.ice \ $(SDIR)/PermissionsVerifier.ice \ + $(SDIR)/PermissionsVerifierF.ice \ $(SDIR)/Router.ice \ $(SDIR)/RouterF.ice \ $(SDIR)/Session.ice \ - $(SDIR)/SSLInfo.ice \ - $(SDIR)/Metrics.ice + $(SDIR)/SSLInfo.ice PDBNAME = $(LIBNAME:.lib=.pdb) CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS -DWIN32_LEAN_AND_MEAN diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index c351e9f3276..5362c10ddc6 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -10,34 +10,34 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) -SONAME = $(call mksoname,Ice,$(SOVERSION)) +SONAME = $(call mksoname,Ice,$(SOVERSION)) LIBNAME = $(call mklibname,Ice) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = Acceptor.o \ ACM.o \ Application.o \ - Base64.o \ - Buffer.o \ + Base64.o \ BasicStream.o \ + Buffer.o \ BuiltinSequences.o \ CollocatedRequestHandler.o \ - CommunicatorI.o \ Communicator.o \ - ConnectRequestHandler.o \ + CommunicatorI.o \ + Connection.o \ ConnectionFactory.o \ ConnectionI.o \ - Connection.o \ ConnectionRequestHandler.o \ Connector.o \ + ConnectRequestHandler.o \ Current.o \ DefaultsAndOverrides.o \ - DeprecatedStringConverter.o \ - DispatchInterceptor.o \ + DeprecatedStringConverter.o \ + DispatchInterceptor.o \ DynamicLibrary.o \ Endpoint.o \ - EndpointFactoryManager.o \ EndpointFactory.o \ + EndpointFactoryManager.o \ EndpointI.o \ EndpointTypes.o \ EventHandler.o \ @@ -46,59 +46,60 @@ OBJS = Acceptor.o \ FactoryTable.o \ FactoryTableInit.o \ GCObject.o \ + HttpParser.o \ Identity.o \ - ImplicitContextI.o \ ImplicitContext.o \ - IncomingAsync.o \ + ImplicitContextI.o \ Incoming.o \ + IncomingAsync.o \ Initialize.o \ Instance.o \ + Instrumentation.o \ + InstrumentationI.o \ IPEndpointI.o \ LocalException.o \ LocalObject.o \ - LocatorInfo.o \ Locator.o \ + LocatorInfo.o \ Logger.o \ - LoggerAdminI.o \ - LoggerI.o \ + LoggerAdminI.o \ + LoggerI.o \ LoggerUtil.o \ Metrics.o \ MetricsAdminI.o \ MetricsObserverI.o \ Network.o \ + Object.o \ + ObjectAdapter.o \ ObjectAdapterFactory.o \ ObjectAdapterI.o \ - ObjectAdapter.o \ - ObjectFactoryManager.o \ ObjectFactory.o \ - Object.o \ - Instrumentation.o \ + ObjectFactoryManager.o \ ObserverHelper.o \ - InstrumentationI.o \ OpaqueEndpointI.o \ - OutgoingAsync.o \ Outgoing.o \ - PluginManagerI.o \ + OutgoingAsync.o \ Plugin.o \ + PluginManagerI.o \ Process.o \ + Properties.o \ + PropertiesAdmin.o \ PropertiesAdminI.o \ PropertiesI.o \ - PropertiesAdmin.o \ - Properties.o \ PropertyNames.o \ Protocol.o \ ProtocolInstance.o \ ProtocolPluginFacade.o \ - ProxyFactory.o \ Proxy.o \ - ReferenceFactory.o \ + ProxyFactory.o \ Reference.o \ - RemoteLogger.o \ + ReferenceFactory.o \ + RemoteLogger.o \ + RequestHandler.o \ ResponseHandler.o \ RetryQueue.o \ - RequestHandler.o \ - RouterInfo.o \ Router.o \ + RouterInfo.o \ Selector.o \ ServantLocator.o \ ServantManager.o \ @@ -106,14 +107,14 @@ OBJS = Acceptor.o \ SliceChecksumDict.o \ SliceChecksums.o \ SlicedData.o \ - StreamI.o \ Stream.o \ + StreamI.o \ StringConverterPlugin.o \ TcpAcceptor.o \ TcpConnector.o \ TcpEndpointI.o \ TcpTransceiver.o \ - ThreadPool.o \ + ThreadPool.o \ TraceLevels.o \ TraceUtil.o \ Transceiver.o \ @@ -121,10 +122,9 @@ OBJS = Acceptor.o \ UdpEndpointI.o \ UdpTransceiver.o \ Version.o \ - HttpParser.o \ - WSEndpoint.o \ WSAcceptor.o \ WSConnector.o \ + WSEndpoint.o \ WSTransceiver.o ifeq ($(findstring MINGW,$(shell uname)),) @@ -136,44 +136,44 @@ SRCS = $(OBJS:.o=.cpp) \ DLLMain.cpp SLICE_SRCS = $(SDIR)/BuiltinSequences.ice \ - $(SDIR)/CommunicatorF.ice \ $(SDIR)/Communicator.ice \ - $(SDIR)/ConnectionF.ice \ + $(SDIR)/CommunicatorF.ice \ $(SDIR)/Connection.ice \ + $(SDIR)/ConnectionF.ice \ $(SDIR)/Current.ice \ $(SDIR)/Endpoint.ice \ $(SDIR)/EndpointF.ice \ $(SDIR)/EndpointTypes.ice \ $(SDIR)/FacetMap.ice \ $(SDIR)/Identity.ice \ - $(SDIR)/ImplicitContextF.ice \ $(SDIR)/ImplicitContext.ice \ + $(SDIR)/ImplicitContextF.ice \ + $(SDIR)/Instrumentation.ice \ + $(SDIR)/InstrumentationF.ice \ $(SDIR)/LocalException.ice \ - $(SDIR)/LocatorF.ice \ $(SDIR)/Locator.ice \ - $(SDIR)/LoggerF.ice \ + $(SDIR)/LocatorF.ice \ $(SDIR)/Logger.ice \ + $(SDIR)/LoggerF.ice \ $(SDIR)/Metrics.ice \ - $(SDIR)/ObjectAdapterF.ice \ $(SDIR)/ObjectAdapter.ice \ - $(SDIR)/ObjectFactoryF.ice \ + $(SDIR)/ObjectAdapterF.ice \ $(SDIR)/ObjectFactory.ice \ - $(SDIR)/Instrumentation.ice \ - $(SDIR)/InstrumentationF.ice \ - $(SDIR)/PluginF.ice \ + $(SDIR)/ObjectFactoryF.ice \ $(SDIR)/Plugin.ice \ - $(SDIR)/ProcessF.ice \ + $(SDIR)/PluginF.ice \ $(SDIR)/Process.ice \ - $(SDIR)/PropertiesF.ice \ - $(SDIR)/PropertiesAdmin.ice \ + $(SDIR)/ProcessF.ice \ $(SDIR)/Properties.ice \ - $(SDIR)/RemoteLogger.ice \ - $(SDIR)/RouterF.ice \ + $(SDIR)/PropertiesAdmin.ice \ + $(SDIR)/PropertiesF.ice \ + $(SDIR)/RemoteLogger.ice \ $(SDIR)/Router.ice \ - $(SDIR)/ServantLocatorF.ice \ + $(SDIR)/RouterF.ice \ $(SDIR)/ServantLocator.ice \ + $(SDIR)/ServantLocatorF.ice \ $(SDIR)/SliceChecksumDict.ice \ - $(SDIR)/Version.ice \ + $(SDIR)/Version.ice HDIR = $(headerdir)/Ice SDIR = $(slicedir)/Ice diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 2d847dce230..8e167cd3f9f 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -17,28 +17,28 @@ TARGETS = $(LIBNAME) $(DLLNAME) OBJS = Acceptor.obj \ ACM.obj \ Application.obj \ - Base64.obj \ - Buffer.obj \ + Base64.obj \ BasicStream.obj \ + Buffer.obj \ BuiltinSequences.obj \ - CommunicatorI.obj \ - Communicator.obj \ CollocatedRequestHandler.obj \ - ConnectRequestHandler.obj \ + Communicator.obj \ + CommunicatorI.obj \ + Connection.obj \ ConnectionFactory.obj \ ConnectionI.obj \ - Connection.obj \ - Connector.obj \ ConnectionRequestHandler.obj \ + Connector.obj \ + ConnectRequestHandler.obj \ Current.obj \ DefaultsAndOverrides.obj \ - DeprecatedStringConverter.obj \ - DispatchInterceptor.obj \ + DeprecatedStringConverter.obj \ + DispatchInterceptor.obj \ DLLMain.obj \ DynamicLibrary.obj \ - EndpointFactoryManager.obj \ - EndpointFactory.obj \ Endpoint.obj \ + EndpointFactory.obj \ + EndpointFactoryManager.obj \ EndpointI.obj \ EndpointTypes.obj \ EventHandler.obj \ @@ -47,59 +47,60 @@ OBJS = Acceptor.obj \ FactoryTable.obj \ FactoryTableInit.obj \ GCObject.obj \ + HttpParser.obj \ Identity.obj \ - ImplicitContextI.obj \ ImplicitContext.obj \ - IncomingAsync.obj \ + ImplicitContextI.obj \ Incoming.obj \ + IncomingAsync.obj \ Initialize.obj \ Instance.obj \ + Instrumentation.obj \ + InstrumentationI.obj \ IPEndpointI.obj \ LocalException.obj \ LocalObject.obj \ - LocatorInfo.obj \ Locator.obj \ - LoggerAdminI.obj \ - LoggerI.obj \ + LocatorInfo.obj \ Logger.obj \ + LoggerAdminI.obj \ + LoggerI.obj \ LoggerUtil.obj \ Metrics.obj \ MetricsAdminI.obj \ MetricsObserverI.obj \ Network.obj \ + Object.obj \ + ObjectAdapter.obj \ ObjectAdapterFactory.obj \ ObjectAdapterI.obj \ - ObjectAdapter.obj \ - ObjectFactoryManager.obj \ ObjectFactory.obj \ - Object.obj \ - Instrumentation.obj \ + ObjectFactoryManager.obj \ ObserverHelper.obj \ - InstrumentationI.obj \ OpaqueEndpointI.obj \ - OutgoingAsync.obj \ Outgoing.obj \ - PluginManagerI.obj \ + OutgoingAsync.obj \ Plugin.obj \ + PluginManagerI.obj \ Process.obj \ + Properties.obj \ + PropertiesAdmin.obj \ PropertiesAdminI.obj \ PropertiesI.obj \ - PropertiesAdmin.obj \ - Properties.obj \ PropertyNames.obj \ Protocol.obj \ ProtocolInstance.obj \ ProtocolPluginFacade.obj \ - ProxyFactory.obj \ Proxy.obj \ - ReferenceFactory.obj \ + ProxyFactory.obj \ Reference.obj \ - RemoteLogger.obj \ - RetryQueue.obj \ + ReferenceFactory.obj \ + RemoteLogger.obj \ RequestHandler.obj \ ResponseHandler.obj \ - RouterInfo.obj \ + RetryQueue.obj \ Router.obj \ + RouterInfo.obj \ Selector.obj \ ServantLocator.obj \ ServantManager.obj \ @@ -107,14 +108,14 @@ OBJS = Acceptor.obj \ SliceChecksumDict.obj \ SliceChecksums.obj \ SlicedData.obj \ - StreamI.obj \ Stream.obj \ - StringConverterPlugin.obj \ + StreamI.obj \ + StringConverterPlugin.obj \ TcpAcceptor.obj \ TcpConnector.obj \ TcpEndpointI.obj \ TcpTransceiver.obj \ - ThreadPool.obj \ + ThreadPool.obj \ TraceLevels.obj \ TraceUtil.obj \ Transceiver.obj \ @@ -122,10 +123,9 @@ OBJS = Acceptor.obj \ UdpEndpointI.obj \ UdpTransceiver.obj \ Version.obj \ - HttpParser.obj \ - WSEndpoint.obj \ WSAcceptor.obj \ WSConnector.obj \ + WSEndpoint.obj \ WSTransceiver.obj SRCS = $(OBJS:.obj=.cpp) @@ -153,7 +153,7 @@ $(DLLNAME): $(OBJS) Ice.res $(LINK) $(BASE):0x22000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) Service.obj: EventLoggerMsg.h @@ -166,44 +166,44 @@ Ice.res: EventLoggerMsg.rc clean:: -del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h - -del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h -del /q Communicator.cpp $(HDIR)\Communicator.h - -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h + -del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h -del /q Connection.cpp $(HDIR)\Connection.h + -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h -del /q Current.cpp $(HDIR)\Current.h -del /q Endpoint.cpp $(HDIR)\Endpoint.h -del /q EndpointF.cpp $(HDIR)\EndpointF.h -del /q EndpointTypes.cpp $(HDIR)\EndpointTypes.h -del /q FacetMap.cpp $(HDIR)\FacetMap.h - -del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h - -del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h -del /q Identity.cpp $(HDIR)\Identity.h + -del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h + -del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h + -del /q Instrumentation.cpp $(HDIR)\Instrumentation.h + -del /q InstrumentationF.cpp $(HDIR)\InstrumentationF.h -del /q LocalException.cpp $(HDIR)\LocalException.h - -del /q LocatorF.cpp $(HDIR)\LocatorF.h -del /q Locator.cpp $(HDIR)\Locator.h - -del /q LoggerF.cpp $(HDIR)\LoggerF.h + -del /q LocatorF.cpp $(HDIR)\LocatorF.h -del /q Logger.cpp $(HDIR)\Logger.h + -del /q LoggerF.cpp $(HDIR)\LoggerF.h -del /q Metrics.cpp $(HDIR)\Metrics.h - -del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h -del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h - -del /q Instrumentation.cpp $(HDIR)\Instrumentation.h - -del /q InstrumentationF.cpp $(HDIR)\InstrumentationF.h - -del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h + -del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h -del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h - -del /q PluginF.cpp $(HDIR)\PluginF.h + -del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h -del /q Plugin.cpp $(HDIR)\Plugin.h - -del /q ProcessF.cpp $(HDIR)\ProcessF.h + -del /q PluginF.cpp $(HDIR)\PluginF.h -del /q Process.cpp $(HDIR)\Process.h - -del /q PropertiesF.cpp $(HDIR)\PropertiesF.h - -del /q PropertiesAdmin.cpp $(HDIR)\PropertiesAdmin.h + -del /q ProcessF.cpp $(HDIR)\ProcessF.h -del /q Properties.cpp $(HDIR)\Properties.h - -del /q RemoteLogger.cpp $(HDIR)\RemoteLogger.h - -del /q RouterF.cpp $(HDIR)\RouterF.h + -del /q PropertiesAdmin.cpp $(HDIR)\PropertiesAdmin.h + -del /q PropertiesF.cpp $(HDIR)\PropertiesF.h + -del /q RemoteLogger.cpp $(HDIR)\RemoteLogger.h -del /q Router.cpp $(HDIR)\Router.h - -del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h + -del /q RouterF.cpp $(HDIR)\RouterF.h -del /q ServantLocator.cpp $(HDIR)\ServantLocator.h + -del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h -del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h - -del /q Version.cpp $(HDIR)\Version.h + -del /q Version.cpp $(HDIR)\Version.h -del /q Ice.res install:: all diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index 1766096fc62..7649c773d4c 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -9,21 +9,21 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) -SONAME = $(call mksoname,IceBox,$(SOVERSION)) +LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION)) +SONAME = $(call mksoname,IceBox,$(SOVERSION)) LIBNAME = $(call mklibname,IceBox) SERVER = $(bindir)/icebox ADMIN = $(bindir)/iceboxadmin -LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN) +LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN) -OBJS = IceBox.o \ - Exception.o +OBJS = Exception.o \ + IceBox.o -SOBJS = ServiceManagerI.o \ - Service.o +SOBJS = Service.o \ + ServiceManagerI.o AOBJS = Admin.o diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 35d36715299..6ba4449e6ad 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -19,13 +19,13 @@ SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe ADMIN = $(top_srcdir)\bin\iceboxadmin.exe -TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN) +TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN) -OBJS = IceBox.obj \ - Exception.obj +OBJS = Exception.obj \ + IceBox.obj -SOBJS = ServiceManagerI.obj \ - Service.obj +SOBJS = Service.obj \ + ServiceManagerI.obj AOBJS = Admin.obj diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile index 517932511a5..f63a76d92b4 100644 --- a/cpp/src/IceDiscovery/Makefile +++ b/cpp/src/IceDiscovery/Makefile @@ -10,14 +10,14 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceDiscovery,$(VERSION)) -SONAME = $(call mksoname,IceDiscovery,$(SOVERSION)) +SONAME = $(call mksoname,IceDiscovery,$(SOVERSION)) LIBNAME = $(call mklibname,IceDiscovery) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = LocatorI.o \ +OBJS = IceDiscovery.o \ + LocatorI.o \ LookupI.o \ - IceDiscovery.o \ PluginI.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak index 2247c0424ad..8f1d45d9515 100644 --- a/cpp/src/IceDiscovery/Makefile.mak +++ b/cpp/src/IceDiscovery/Makefile.mak @@ -14,9 +14,9 @@ DLLNAME = $(top_srcdir)\bin\icediscovery$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).d TARGETS = $(LIBNAME) $(DLLNAME) -OBJS = LocatorI.obj \ +OBJS = IceDiscovery.obj \ + LocatorI.obj \ LookupI.obj \ - IceDiscovery.obj \ PluginI.obj SRCS = $(OBJS:.obj=.cpp) diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 57007414325..ddede7da74e 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -15,65 +15,65 @@ REGISTRY_SERVER = $(bindir)/icegridregistry TARGETS = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) -ADMIN_OBJS = Grammar.o \ - Scanner.o \ - Parser.o \ - DescriptorParser.o \ - DescriptorBuilder.o \ +ADMIN_OBJS = Client.o \ + DescriptorBuilder.o \ DescriptorHelper.o \ - FileParserI.o \ - Util.o \ + DescriptorParser.o \ + FileParserI.o \ + Grammar.o \ Internal.o \ - Client.o + Parser.o \ + Scanner.o \ + Util.o -COMMON_OBJS = Internal.o \ - DescriptorParser.o \ - DescriptorBuilder.o \ - TraceLevels.o \ +COMMON_OBJS = DescriptorBuilder.o \ + DescriptorParser.o \ FileCache.o \ + Internal.o \ PlatformInfo.o \ - SessionManager.o + SessionManager.o \ + TraceLevels.o -NODE_OBJS = NodeI.o \ - NodeServerAdminRouter.o \ - ServerI.o \ +NODE_OBJS = Activator.o \ + NodeI.o \ + NodeServerAdminRouter.o \ + NodeSessionManager.o \ ServerAdapterI.o \ - Activator.o \ - NodeSessionManager.o + ServerI.o REGISTRY_OBJS = AdminCallbackRouter.o \ - RegistryI.o \ - PluginFacadeI.o \ - RegistryServerAdminRouter.o \ - InternalRegistryI.o \ - Allocatable.o \ AdapterCache.o \ - ObjectCache.o \ + AdminI.o \ + AdminSessionI.o \ + Allocatable.o \ AllocatableObjectCache.o \ - ServerCache.o \ - NodeCache.o \ - ReplicaCache.o \ Database.o \ + DescriptorHelper.o \ + FileUserAccountMapperI.o \ + IdentityObjectInfoDict.o \ + InternalRegistryI.o \ LocatorI.o \ LocatorRegistryI.o \ - AdminI.o \ - Util.o \ - DescriptorHelper.o \ + NodeCache.o \ NodeSessionI.o \ - ReplicaSessionI.o \ + ObjectCache.o \ + PluginFacadeI.o \ + QueryI.o \ ReapThread.o \ + RegistryI.o \ + RegistryServerAdminRouter.o \ + ReplicaCache.o \ + ReplicaSessionI.o \ + ReplicaSessionManager.o \ + SerialsDict.o \ + ServerCache.o \ SessionI.o \ - AdminSessionI.o \ SessionServantManager.o \ - Topics.o \ - QueryI.o \ - FileUserAccountMapperI.o \ - ReplicaSessionManager.o \ - WellKnownObjectsManager.o \ - StringApplicationInfoDict.o \ - IdentityObjectInfoDict.o \ StringAdapterInfoDict.o \ - SerialsDict.o + StringApplicationInfoDict.o \ + Topics.o \ + Util.o \ + WellKnownObjectsManager.o NODE_SVR_OBJS = $(COMMON_OBJS) \ $(NODE_OBJS) \ diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 7edf4b4f2c1..27810d1a3a9 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -15,65 +15,65 @@ REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry.exe TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) -ADMIN_OBJS = Grammar.obj \ - Scanner.obj \ - Parser.obj \ - DescriptorParser.obj \ +ADMIN_OBJS = Client.obj \ DescriptorBuilder.obj \ DescriptorHelper.obj \ + DescriptorParser.obj \ FileParserI.obj \ - Util.obj \ + Grammar.obj \ Internal.obj \ - Client.obj + Parser.obj \ + Scanner.obj \ + Util.obj -COMMON_OBJS = Internal.obj \ +COMMON_OBJS = DescriptorBuilder.obj \ DescriptorParser.obj \ - DescriptorBuilder.obj \ FileCache.obj \ - TraceLevels.obj \ + Internal.obj \ PlatformInfo.obj \ - SessionManager.obj + SessionManager.obj \ + TraceLevels.obj -NODE_OBJS = NodeI.obj \ - NodeServerAdminRouter.obj \ - ServerI.obj \ +NODE_OBJS = Activator.obj \ + NodeI.obj \ + NodeServerAdminRouter.obj \ + NodeSessionManager.obj \ ServerAdapterI.obj \ - Activator.obj \ - NodeSessionManager.obj + ServerI.obj -REGISTRY_OBJS = AdminCallbackRouter.obj \ - RegistryI.obj \ - PluginFacadeI.obj \ - RegistryServerAdminRouter.obj \ - InternalRegistryI.obj \ - Database.obj \ +REGISTRY_OBJS = AdapterCache.obj \ + AdminCallbackRouter.obj \ + AdminI.obj \ + AdminSessionI.obj \ Allocatable.obj \ - AdapterCache.obj \ - ObjectCache.obj \ AllocatableObjectCache.obj \ - ServerCache.obj \ - NodeCache.obj \ - ReplicaCache.obj \ + Database.obj \ + DescriptorHelper.obj \ + FileUserAccountMapperI.obj \ + IdentityObjectInfoDict.obj \ + InternalRegistryI.obj \ LocatorI.obj \ LocatorRegistryI.obj \ - AdminI.obj \ - Util.obj \ - DescriptorHelper.obj \ + NodeCache.obj \ NodeSessionI.obj \ - ReplicaSessionI.obj \ + ObjectCache.obj \ + PluginFacadeI.obj \ + QueryI.obj \ ReapThread.obj \ + RegistryI.obj \ + RegistryServerAdminRouter.obj \ + ReplicaCache.obj \ + ReplicaSessionI.obj \ + ReplicaSessionManager.obj \ + SerialsDict.obj \ + ServerCache.obj \ SessionI.obj \ - AdminSessionI.obj \ SessionServantManager.obj \ - Topics.obj \ - QueryI.obj \ - FileUserAccountMapperI.obj \ - ReplicaSessionManager.obj \ - WellKnownObjectsManager.obj \ - StringApplicationInfoDict.obj \ - IdentityObjectInfoDict.obj \ StringAdapterInfoDict.obj \ - SerialsDict.obj + StringApplicationInfoDict.obj \ + Topics.obj \ + Util.obj \ + WellKnownObjectsManager.obj NODE_SVR_OBJS = $(COMMON_OBJS) \ $(NODE_OBJS) \ @@ -123,7 +123,7 @@ $(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest -$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res +$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) $(SETARGV) $(PREOUT)$@ \ $(PRELIBS)$(NLINKWITH) $(RRES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile index 888c193070d..9da301c4be1 100644 --- a/cpp/src/IceGridLib/Makefile +++ b/cpp/src/IceGridLib/Makefile @@ -10,41 +10,41 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceGrid,$(VERSION)) -SONAME = $(call mksoname,IceGrid,$(SOVERSION)) +SONAME = $(call mksoname,IceGrid,$(SOVERSION)) LIBNAME = $(call mklibname,IceGrid) LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) TARGETS = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) -LIB_OBJS = Admin.o \ - Locator.o \ - Discovery.o \ - Query.o \ - Exception.o \ +LIB_OBJS = Admin.o \ Descriptor.o \ + Discovery.o \ DiscoveryPluginI.o \ - FileParser.o \ + Exception.o \ + FileParser.o \ + Locator.o \ Observer.o \ - Session.o \ - Registry.o \ - UserAccountMapper.o \ PluginFacade.o \ PluginFacadeI.o \ + Query.o \ + Registry.o \ + Session.o \ + UserAccountMapper.o SRCS = $(LIB_OBJS:.o=.cpp) SLICE_SRCS = $(SDIR)/Admin.ice \ + $(SDIR)/Descriptor.ice \ $(SDIR)/Discovery.ice \ - $(SDIR)/Exception.ice \ - $(SDIR)/FileParser.ice \ - $(SDIR)/Locator.ice \ - $(SDIR)/Query.ice \ + $(SDIR)/Exception.ice \ + $(SDIR)/FileParser.ice \ + $(SDIR)/Locator.ice \ + $(SDIR)/Observer.ice \ + $(SDIR)/PluginFacade.ice \ + $(SDIR)/Query.ice \ $(SDIR)/Registry.ice \ $(SDIR)/Session.ice \ - $(SDIR)/Observer.ice \ - $(SDIR)/Descriptor.ice \ - $(SDIR)/UserAccountMapper.ice \ - $(SDIR)/PluginFacade.ice + $(SDIR)/UserAccountMapper.ice HDIR = $(headerdir)/IceGrid LOCAL_HDIR = ../IceGrid diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index fe0f73e1635..c461da42c82 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -15,19 +15,19 @@ DLLNAME = $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) LIB_OBJS = Admin.obj \ - Locator.obj \ - Discovery.obj \ - Query.obj \ - Exception.obj \ Descriptor.obj \ + Discovery.obj \ DiscoveryPluginI.obj \ - FileParser.obj \ + Exception.obj \ + FileParser.obj \ + Locator.obj \ Observer.obj \ - Session.obj \ - Registry.obj \ - UserAccountMapper.obj \ PluginFacade.obj \ - PluginFacadeI.obj + PluginFacadeI.obj \ + Query.obj \ + Registry.obj \ + Session.obj \ + UserAccountMapper.obj SRCS = $(LIB_OBJS:.obj=.cpp) @@ -53,20 +53,20 @@ $(DLLNAME): $(LIB_OBJS) IceGrid.res $(LINK) $(BASE):0x2B000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: - -del /q FileParser.cpp $(HDIR)\FileParser.h -del /q Admin.cpp $(HDIR)\Admin.h -del /q Descriptor.cpp $(HDIR)\Descriptor.h -del /q Discovery.cpp $(HDIR)\Discovery.h -del /q Exception.cpp $(HDIR)\Exception.h + -del /q FileParser.cpp $(HDIR)\FileParser.h -del /q Locator.cpp $(HDIR)\Locator.h -del /q Observer.cpp $(HDIR)\Observer.h -del /q Query.cpp $(HDIR)\Query.h - -del /q Session.cpp $(HDIR)\Session.h -del /q Registry.cpp $(HDIR)\Registry.h + -del /q Session.cpp $(HDIR)\Session.h -del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h -del /q IceGrid.res diff --git a/cpp/src/IceGridLib/winrt/Makefile.mak b/cpp/src/IceGridLib/winrt/Makefile.mak index c116b374d26..3bc3097e630 100644 --- a/cpp/src/IceGridLib/winrt/Makefile.mak +++ b/cpp/src/IceGridLib/winrt/Makefile.mak @@ -12,28 +12,28 @@ LIBNAME = $(SDK_LIBRARY_PATH)\icegrid.lib TARGETS = $(LIBNAME) SOURCE_DIR = .. -TARGETS = $(LIBNAME) +TARGETS = $(LIBNAME) OBJS = $(ARCH)\$(CONFIG)\Admin.obj \ - $(ARCH)\$(CONFIG)\Locator.obj \ - $(ARCH)\$(CONFIG)\Query.obj \ + $(ARCH)\$(CONFIG)\Descriptor.obj \ $(ARCH)\$(CONFIG)\Exception.obj \ - $(ARCH)\$(CONFIG)\Descriptor.obj \ $(ARCH)\$(CONFIG)\FileParser.obj \ - $(ARCH)\$(CONFIG)\Observer.obj \ - $(ARCH)\$(CONFIG)\Session.obj \ - $(ARCH)\$(CONFIG)\Registry.obj \ - $(ARCH)\$(CONFIG)\UserAccountMapper.obj + $(ARCH)\$(CONFIG)\Locator.obj \ + $(ARCH)\$(CONFIG)\Observer.obj \ + $(ARCH)\$(CONFIG)\Query.obj \ + $(ARCH)\$(CONFIG)\Registry.obj \ + $(ARCH)\$(CONFIG)\Session.obj \ + $(ARCH)\$(CONFIG)\UserAccountMapper.obj SLICE_SRCS = $(SDIR)/Admin.ice \ - $(SDIR)/Exception.ice \ - $(SDIR)/FileParser.ice \ - $(SDIR)/Locator.ice \ - $(SDIR)/Query.ice \ + $(SDIR)/Descriptor.ice \ + $(SDIR)/Exception.ice \ + $(SDIR)/FileParser.ice \ + $(SDIR)/Locator.ice \ + $(SDIR)/Observer.ice \ + $(SDIR)/Query.ice \ $(SDIR)/Registry.ice \ $(SDIR)/Session.ice \ - $(SDIR)/Observer.ice \ - $(SDIR)/Descriptor.ice \ $(SDIR)/UserAccountMapper.ice SRCS = $(OBJS:.obj=.cpp) @@ -66,15 +66,15 @@ depend:: $(ARCH)\$(CONFIG) $(SLICE_SRCS) $(SRCS) $(SRCS_DEPEND) $(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py clean:: - -del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h -del /q $(SOURCE_DIR)\Admin.cpp $(HDIR)\Admin.h -del /q $(SOURCE_DIR)\Descriptor.cpp $(HDIR)\Descriptor.h -del /q $(SOURCE_DIR)\Exception.cpp $(HDIR)\Exception.h + -del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h -del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h -del /q $(SOURCE_DIR)\Observer.cpp $(HDIR)\Observer.h -del /q $(SOURCE_DIR)\Query.cpp $(HDIR)\Query.h - -del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h -del /q $(SOURCE_DIR)\Registry.cpp $(HDIR)\Registry.h + -del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h -del /q $(SOURCE_DIR)\UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h -del /q $(ARCH)\$(CONFIG)\*.obj -del /q $(PDBNAME) diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index 291aa3b1ff2..6b1a265d504 100644 --- a/cpp/src/IcePatch2/Makefile +++ b/cpp/src/IcePatch2/Makefile @@ -15,8 +15,8 @@ CALC = $(bindir)/icepatch2calc TARGETS = $(SERVER) $(CLIENT) $(CALC) -SOBJS = Server.o \ - FileServerI.o +SOBJS = FileServerI.o \ + Server.o COBJS = Client.o diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 616f90f42a4..8d5ef7fafb5 100755 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -15,8 +15,8 @@ CALC = $(top_srcdir)\bin\icepatch2calc.exe TARGETS = $(SERVER) $(CLIENT) $(CALC) -SOBJS = Server.obj \ - FileServerI.obj +SOBJS = FileServerI.obj \ + Server.obj COBJS = Client.obj diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile index 5f4b6bd189e..5bf0339516a 100644 --- a/cpp/src/IcePatch2Lib/Makefile +++ b/cpp/src/IcePatch2Lib/Makefile @@ -9,16 +9,16 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION)) -SONAME = $(call mksoname,IcePatch2,$(SOVERSION)) +LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION)) +SONAME = $(call mksoname,IcePatch2,$(SOVERSION)) LIBNAME = $(call mklibname,IcePatch2) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = Util.o \ - ClientUtil.o \ +OBJS = ClientUtil.o \ FileInfo.o \ - FileServer.o + FileServer.o \ + Util.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak index 68c185edfc1..4acf5c612df 100755 --- a/cpp/src/IcePatch2Lib/Makefile.mak +++ b/cpp/src/IcePatch2Lib/Makefile.mak @@ -12,12 +12,12 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib DLLNAME = $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll -TARGETS = $(LIBNAME) $(DLLNAME) +TARGETS = $(LIBNAME) $(DLLNAME) -OBJS = Util.obj \ - ClientUtil.obj \ +OBJS = ClientUtil.obj \ FileInfo.obj \ - FileServer.obj + FileServer.obj \ + Util.obj SRCS = $(OBJS:.obj=.cpp) diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index c63570744ae..1859e39b47a 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -10,30 +10,30 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) -SONAME = $(call mksoname,IceSSL,$(SOVERSION)) +LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) +SONAME = $(call mksoname,IceSSL,$(SOVERSION)) LIBNAME = $(call mklibname,IceSSL) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = AcceptorI.o \ +OBJS = AcceptorI.o \ Certificate.o \ - ConnectorI.o \ - EndpointInfo.o \ ConnectionInfo.o \ + ConnectorI.o \ EndpointI.o \ + EndpointInfo.o \ Instance.o \ - PluginI.o \ + OpenSSLEngine.o \ OpenSSLTransceiverI.o \ - SecureTransportTransceiverI.o \ - Util.o \ + PluginI.o \ RFC2253.o \ - TrustManager.o \ - SSLEngine.o \ - OpenSSLEngine.o \ - SecureTransportEngine.o \ SChannelEngine.o \ - SChannelTransceiverI.o + SChannelTransceiverI.o \ + SecureTransportEngine.o \ + SecureTransportTransceiverI.o \ + SSLEngine.o \ + TrustManager.o \ + Util.o SRCS = $(OBJS:.o=.cpp) @@ -41,11 +41,11 @@ SLICE_SRCS = $(SDIR)/EndpointInfo.ice \ $(SDIR)/ConnectionInfo.ice HDIR = $(headerdir)/IceSSL -SDIR = $(slicedir)/IceSSL +SDIR = $(slicedir)/IceSSL include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS) diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 4e06d935fd0..fea43083647 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -16,18 +16,18 @@ TARGETS = $(LIBNAME) $(DLLNAME) OBJS = AcceptorI.obj \ Certificate.obj \ - SSLEngine.obj \ - ConnectorI.obj \ ConnectionInfo.obj \ - EndpointInfo.obj \ + ConnectorI.obj \ EndpointI.obj \ + EndpointInfo.obj \ Instance.obj \ PluginI.obj \ + RFC2253.obj \ SChannelEngine.obj \ SChannelTransceiverI.obj \ - Util.obj \ - RFC2253.obj \ - TrustManager.obj + SSLEngine.obj \ + TrustManager.obj \ + Util.obj SRCS = $(OBJS:.obj=.cpp) diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 912fb2ec5cb..78b1591f09b 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -10,7 +10,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION)) -SONAME = $(call mksoname,IceStormService,$(SOVERSION)) +SONAME = $(call mksoname,IceStormService,$(SOVERSION)) LIBNAME = $(call mklibname,IceStormService) ADMIN = $(bindir)/icestormadmin @@ -18,61 +18,61 @@ MIGRATE = $(bindir)/icestormmigrate LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) TARGETS = $(LIBTARGETS) $(ADMIN) $(MIGRATE) -OBJS = NodeI.o \ - Observers.o \ +OBJS = Election.o \ + IceStormInternal.o \ Instance.o \ - TraceLevels.o \ + Instrumentation.o \ + InstrumentationI.o \ + LinkRecord.o \ + LLUMap.o \ + LLURecord.o \ + NodeI.o \ + Observers.o \ + Service.o \ Subscriber.o \ + SubscriberMap.o \ + SubscriberRecord.o \ TopicI.o \ TopicManagerI.o \ + TraceLevels.o \ TransientTopicI.o \ TransientTopicManagerI.o \ - Service.o \ - LLURecord.o \ - Election.o \ - SubscriberRecord.o \ - IceStormInternal.o \ - Instrumentation.o \ - InstrumentationI.o \ Util.o \ - LLUMap.o \ - SubscriberMap.o \ - V32FormatDB.o \ + V31Format.o \ V31FormatDB.o \ - LinkRecord.o \ V32Format.o \ - V31Format.o + V32FormatDB.o -AOBJS = Admin.o \ +AOBJS = Admin.o \ + Election.o \ Grammar.o \ - Scanner.o \ - Parser.o \ + IceStormInternal.o \ LLURecord.o \ - Election.o \ - SubscriberRecord.o \ - IceStormInternal.o + Parser.o \ + Scanner.o \ + SubscriberRecord.o -MOBJS = Migrate.o \ - SubscriberMap.o \ +MOBJS = LinkRecord.o \ LLUMap.o \ - LinkRecord.o \ - V32FormatDB.o \ + Migrate.o \ + SubscriberMap.o \ + V31Format.o \ V31FormatDB.o \ V32Format.o \ - V31Format.o + V32FormatDB.o SRCS = $(OBJS:.o=.cpp) \ $(AOBJS:.o=.cpp) \ $(MOBJS:.o=.cpp) -SLICE_SRCS = ../IceStorm/Instrumentation.ice \ - ../IceStorm/Election.ice \ +SLICE_SRCS = ../IceStorm/Election.ice \ ../IceStorm/IceStormInternal.ice \ + ../IceStorm/Instrumentation.ice \ + ../IceStorm/LinkRecord.ice \ ../IceStorm/LLURecord.ice \ ../IceStorm/SubscriberRecord.ice \ - ../IceStorm/LinkRecord.ice \ - ../IceStorm/V32Format.ice \ ../IceStorm/V31Format.ice \ + ../IceStorm/V32Format.ice HDIR = $(headerdir)/IceStorm SDIR = $(slicedir)/IceStorm @@ -144,11 +144,11 @@ V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) ../IceStorm/Grammar.y: Grammar.h clean:: + -rm -f LinkRecord.h LinkRecord.cpp + -rm -f LLUMap.h LLUMap.cpp -rm -f SubscriberMap.h SubscriberMap.cpp - -rm -f V32FormatDB.h V32FormatDB.cpp -rm -f V31FormatDB.h V31FormatDB.cpp - -rm -f LLUMap.h LLUMap.cpp - -rm -f LinkRecord.h LinkRecord.cpp + -rm -f V32FormatDB.h V32FormatDB.cpp install:: all $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 44193b97296..9e96e369252 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -15,50 +15,50 @@ DLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX ADMIN = $(top_srcdir)\bin\icestormadmin.exe MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe -TARGETS = $(LIBNAME) $(DLLNAME) $(ADMIN) $(MIGRATE) +TARGETS = $(LIBNAME) $(DLLNAME) $(ADMIN) $(MIGRATE) -OBJS = NodeI.obj \ - Observers.obj \ +OBJS = Election.obj \ + IceStormInternal.obj \ Instance.obj \ - TraceLevels.obj \ + Instrumentation.obj \ + InstrumentationI.obj \ + LinkRecord.obj \ + LLUMap.obj \ + LLURecord.obj \ + NodeI.obj \ + Observers.obj \ + Service.obj \ Subscriber.obj \ + SubscriberMap.obj \ + SubscriberRecord.obj \ TopicI.obj \ TopicManagerI.obj \ + TraceLevels.obj \ TransientTopicI.obj \ TransientTopicManagerI.obj \ - Service.obj \ - LLURecord.obj \ - Election.obj \ - SubscriberRecord.obj \ - IceStormInternal.obj \ - Instrumentation.obj \ - InstrumentationI.obj \ Util.obj \ - LLUMap.obj \ - SubscriberMap.obj \ - V32FormatDB.obj \ + V31Format.obj \ V31FormatDB.obj \ - LinkRecord.obj \ V32Format.obj \ - V31Format.obj + V32FormatDB.obj AOBJS = Admin.obj \ + Election.obj \ Grammar.obj \ - Scanner.obj \ - Parser.obj \ + IceStormInternal.obj \ LLURecord.obj \ - Election.obj \ - SubscriberRecord.obj \ - IceStormInternal.obj + Parser.obj \ + Scanner.obj \ + SubscriberRecord.obj -MOBJS = Migrate.obj \ - SubscriberMap.obj \ +MOBJS = LinkRecord.obj \ LLUMap.obj \ - LinkRecord.obj \ - V32FormatDB.obj \ + Migrate.obj \ + SubscriberMap.obj \ + V31Format.obj \ V31FormatDB.obj \ V32Format.obj \ - V31Format.obj + V32FormatDB.obj SRCS = $(OBJS:.obj=.cpp) \ $(AOBJS:.obj=.cpp) \ @@ -97,7 +97,7 @@ $(DLLNAME): $(OBJS) $(RES_FILE) $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) -$(ADMIN): $(AOBJS) $(ARES_FILE) +$(ADMIN): $(AOBJS) $(ARES_FILE) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) $(ARES_FILE) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest @@ -148,17 +148,17 @@ V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) V31FormatDB V31Format.ice clean:: - -del /q IceStormInternal.cpp IceStormInternal.h - -del /q LLURecord.cpp LLURecord.h -del /q Election.cpp Election.h - -del /q SubscriberRecord.cpp SubscriberRecord.h + -del /q IceStormInternal.cpp IceStormInternal.h -del /q Instrumentation.cpp Instrumentation.h + -del /q LinkRecord.cpp LinkRecord.h -del /q LLUMap.h LLUMap.cpp + -del /q LLURecord.cpp LLURecord.h -del /q SubscriberMap.h SubscriberMap.cpp - -del /q LinkRecord.cpp LinkRecord.h - -del /q V32FormatDB.cpp V31FormatDB.cpp V32FormatDB.h V31FormatDB.h - -del /q V32Format.cpp V32Format.h + -del /q SubscriberRecord.cpp SubscriberRecord.h -del /q V31Format.cpp V31Format.h + -del /q V32Format.cpp V32Format.h + -del /q V32FormatDB.cpp V31FormatDB.cpp V32FormatDB.h V31FormatDB.h -del /q $(ADMIN:.exe=.*) -del /q $(MIGRATE:.exe=.*) -del /q IceStormAdmin.res IceStormDB.res IceStormService.res diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile index f093579089d..23719b9ea9a 100644 --- a/cpp/src/IceStormLib/Makefile +++ b/cpp/src/IceStormLib/Makefile @@ -9,8 +9,8 @@ top_srcdir = ../.. -LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION)) -SONAME = $(call mksoname,IceStorm,$(SOVERSION)) +LIBFILENAME = $(call mklibfilename,IceStorm,$(VERSION)) +SONAME = $(call mksoname,IceStorm,$(SOVERSION)) LIBNAME = $(call mklibname,IceStorm) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak index dcd470adfaf..206b73f5e21 100644 --- a/cpp/src/IceStormLib/Makefile.mak +++ b/cpp/src/IceStormLib/Makefile.mak @@ -12,7 +12,7 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib DLLNAME = $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll -TARGETS = $(LIBNAME) $(DLLNAME) +TARGETS = $(LIBNAME) $(DLLNAME) OBJS = IceStorm.obj \ Metrics.obj diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index f5571c56242..c38f641037d 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -10,7 +10,7 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) -SONAME = $(call mksoname,IceUtil,$(SOVERSION)) +SONAME = $(call mksoname,IceUtil,$(SOVERSION)) LIBNAME = $(call mklibname,IceUtil) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) @@ -20,23 +20,23 @@ OBJS = ArgVector.o \ CountDownLatch.o \ CtrlCHandler.o \ Exception.o \ + FileUtil.o \ InputUtil.o \ + MutexProtocol.o \ Options.o \ OutputUtil.o \ Random.o \ RecMutex.o \ + SHA1.o \ Shared.o \ + StringConverter.o \ StringUtil.o \ Thread.o \ ThreadException.o \ Time.o \ Timer.o \ - UUID.o \ Unicode.o \ - MutexProtocol.o \ - FileUtil.o \ - StringConverter.o \ - SHA1.o + UUID.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index 3d5a3de8ff4..1b2528626f7 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -10,45 +10,45 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll +DLLNAME = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) OBJS = ArgVector.obj \ - Cond.obj \ - ConvertUTF.obj \ + Cond.obj \ + ConvertUTF.obj \ CountDownLatch.obj \ CtrlCHandler.obj \ Exception.obj \ FileUtil.obj \ InputUtil.obj \ + MutexProtocol.obj \ Options.obj \ OutputUtil.obj \ Random.obj \ RecMutex.obj \ + SHA1.obj \ Shared.obj \ + StringConverter.obj \ StringUtil.obj \ Thread.obj \ ThreadException.obj \ Time.obj \ Timer.obj \ - UUID.obj \ Unicode.obj \ - MutexProtocol.obj \ - StringConverter.obj \ - SHA1.obj + UUID.obj SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN +CPPFLAGS = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) !if "$(WINRT)" != "yes" -CPPFLAGS = $(CPPFLAGS) -DICE_WIN32_STACK_TRACES +CPPFLAGS = $(CPPFLAGS) -DICE_WIN32_STACK_TRACES !endif !endif @@ -67,10 +67,10 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) IceUtil.res $(LINK) $(BASE):0x20000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS) $(ICEUTIL_OS_LIBS) \ - $(RES_FILE) + $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) !endif diff --git a/cpp/src/IceUtil/winrt/Makefile.mak b/cpp/src/IceUtil/winrt/Makefile.mak index 477b505ea78..8d6b94598bf 100644 --- a/cpp/src/IceUtil/winrt/Makefile.mak +++ b/cpp/src/IceUtil/winrt/Makefile.mak @@ -15,27 +15,27 @@ SOURCE_DIR = .. TARGETS = $(LIBNAME) OBJS = $(ARCH)\$(CONFIG)\ArgVector.obj \ - $(ARCH)\$(CONFIG)\Cond.obj \ - $(ARCH)\$(CONFIG)\ConvertUTF.obj \ + $(ARCH)\$(CONFIG)\Cond.obj \ + $(ARCH)\$(CONFIG)\ConvertUTF.obj \ $(ARCH)\$(CONFIG)\CountDownLatch.obj \ $(ARCH)\$(CONFIG)\Exception.obj \ $(ARCH)\$(CONFIG)\FileUtil.obj \ $(ARCH)\$(CONFIG)\InputUtil.obj \ + $(ARCH)\$(CONFIG)\MutexProtocol.obj \ $(ARCH)\$(CONFIG)\Options.obj \ $(ARCH)\$(CONFIG)\OutputUtil.obj \ $(ARCH)\$(CONFIG)\Random.obj \ $(ARCH)\$(CONFIG)\RecMutex.obj \ + $(ARCH)\$(CONFIG)\SHA1.obj \ $(ARCH)\$(CONFIG)\Shared.obj \ + $(ARCH)\$(CONFIG)\StringConverter.obj \ $(ARCH)\$(CONFIG)\StringUtil.obj \ $(ARCH)\$(CONFIG)\Thread.obj \ $(ARCH)\$(CONFIG)\ThreadException.obj \ $(ARCH)\$(CONFIG)\Time.obj \ $(ARCH)\$(CONFIG)\Timer.obj \ - $(ARCH)\$(CONFIG)\UUID.obj \ $(ARCH)\$(CONFIG)\Unicode.obj \ - $(ARCH)\$(CONFIG)\MutexProtocol.obj \ - $(ARCH)\$(CONFIG)\StringConverter.obj \ - $(ARCH)\$(CONFIG)\SHA1.obj + $(ARCH)\$(CONFIG)\UUID.obj SRCS = $(OBJS:.obj=.cpp) SRCS = $(SRCS:x86\=) @@ -63,7 +63,7 @@ $(LIBNAME): $(OBJS) sdks clean:: -del /q $(ARCH)\$(CONFIG)\*.obj -del /q $(PDBNAME) - + install:: all !include .depend.mak diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index f644eabeb0a..9524d52b0de 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -10,33 +10,33 @@ top_srcdir = ../.. LIBFILENAME = $(call mklibfilename,Slice,$(VERSION)) -SONAME = $(call mksoname,Slice,$(SOVERSION)) +SONAME = $(call mksoname,Slice,$(SOVERSION)) LIBNAME = $(call mklibname,Slice) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -OBJS = Scanner.o \ - ../Slice/Grammar.o \ - Parser.o \ +OBJS = Checksum.o \ CPlusPlusUtil.o \ CsUtil.o \ + DotNetNames.o \ + FileTracker.o \ JavaUtil.o \ + MD5.o \ + MD5I.o \ + Parser.o \ + PHPUtil.o \ Preprocessor.o \ - Checksum.o \ PythonUtil.o \ - DotNetNames.o \ RubyUtil.o \ - PHPUtil.o \ + Scanner.o \ Util.o \ - FileTracker.o \ - MD5.o \ - MD5I.o + ../Slice/Grammar.o SRCS = $(OBJS:.o=.cpp) include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS +CPPFLAGS := -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS BISONFLAGS := --name-prefix "slice_" $(BISONFLAGS) LINKWITH := $(BASELIBS) $(MCPP_LIBS) diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index 8cf01623ff7..6873150b3c3 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -14,22 +14,22 @@ DLLNAME = $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) -OBJS = Scanner.obj \ - Grammar.obj \ - Parser.obj \ +OBJS = Checksum.obj \ CPlusPlusUtil.obj \ CsUtil.obj \ + DotNetNames.obj \ + FileTracker.obj \ + Grammar.obj \ JavaUtil.obj \ + MD5.obj \ + MD5I.obj \ + Parser.obj \ + PHPUtil.obj \ Preprocessor.obj \ - Checksum.obj \ PythonUtil.obj \ - DotNetNames.obj \ RubyUtil.obj \ - PHPUtil.obj \ - Util.obj \ - FileTracker.obj \ - MD5.obj \ - MD5I.obj + Scanner.obj \ + Util.obj SRCS = $(OBJS:.obj=.cpp) @@ -56,10 +56,10 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) Slice.res $(LINK) $(BASE):0x21000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) $(MCPP_LIBS) \ - $(RES_FILE) + $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) !endif diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index 26dd95146f5..7d9d7cbb4d8 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -13,8 +13,8 @@ NAME = $(bindir)/slice2confluence TARGETS = $(NAME) -OBJS = Gen.o \ - ConfluenceOutput.o \ +OBJS = ConfluenceOutput.o \ + Gen.o \ Main.o SRCS = $(OBJS:.o=.cpp) diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index 9fbf836d71a..797040e9115 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -13,8 +13,8 @@ NAME = $(top_srcdir)\bin\slice2confluence.exe TARGETS = $(NAME) -OBJS = Gen.obj \ - ConfluenceOutput.obj \ +OBJS = ConfluenceOutput.obj \ + Gen.obj \ Main.obj SRCS = $(OBJS:.obj=.cpp) |