diff options
Diffstat (limited to 'cpp/demo/Database/Oracle')
| -rw-r--r-- | cpp/demo/Database/Oracle/.depend | 0 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/.depend | 0 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/.depend.mak | 0 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/Makefile | 27 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/Makefile.mak | 25 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/.depend | 0 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/.depend.mak | 0 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/Makefile | 27 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/Makefile.mak | 23 |
9 files changed, 44 insertions, 58 deletions
diff --git a/cpp/demo/Database/Oracle/.depend b/cpp/demo/Database/Oracle/.depend deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Database/Oracle/.depend +++ /dev/null diff --git a/cpp/demo/Database/Oracle/occi/.depend b/cpp/demo/Database/Oracle/occi/.depend deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Database/Oracle/occi/.depend +++ /dev/null diff --git a/cpp/demo/Database/Oracle/occi/.depend.mak b/cpp/demo/Database/Oracle/occi/.depend.mak deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Database/Oracle/occi/.depend.mak +++ /dev/null diff --git a/cpp/demo/Database/Oracle/occi/Makefile b/cpp/demo/Database/Oracle/occi/Makefile index b3cc886bd94..21dc52e64e9 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile +++ b/cpp/demo/Database/Oracle/occi/Makefile @@ -14,13 +14,13 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -SLICE_SRCS = HR.ice +SLICE_OBJS = HR.o -OBJS = HR.o +COBJS = $(SLICE_OBJS) \ + Client.o -COBJS = Client.o - -SOBJS = DbTypes.o \ +SOBJS = $(SLICE_OBJS) \ + DbTypes.o \ DbTypesMap.o \ DeptFactoryI.o \ DeptI.o \ @@ -29,9 +29,8 @@ SOBJS = DbTypes.o \ Server.o \ Util.o -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) +OBJS = $(COBJS) \ + $(SOBJS) include $(top_srcdir)/config/Make.rules @@ -39,13 +38,13 @@ CPPFLAGS := -I. -I$(ORACLE_HOME)/rdbms/public $(CPPFLAGS) ORACLE_LIBS = -L$(ORACLE_HOME)/lib -locci -lclntsh -$(CLIENT): $(OBJS) $(COBJS) +$(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) -$(SERVER): $(OBJS) $(SOBJS) +$(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(ORACLE_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ @@ -55,7 +54,3 @@ DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ clean:: -rm -f DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ - -include .depend - - diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak index c938c80b57e..4c49c2ac999 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile.mak +++ b/cpp/demo/Database/Oracle/occi/Makefile.mak @@ -14,13 +14,13 @@ SERVER = server.exe TARGETS = $(CLIENT) $(SERVER) -SLICE_SRCS = HR.ice +SLICE_OBJS = HR.obj -OBJS = HR.obj +COBJS = $(SLICE_OBJS) \ + Client.obj -COBJS = Client.obj - -SOBJS = DbTypes.obj \ +SOBJS = $(SLICE_OBJS) \ + DbTypes.obj \ DbTypesMap.obj \ DeptFactoryI.obj \ DeptI.obj \ @@ -29,9 +29,8 @@ SOBJS = DbTypes.obj \ Server.obj \ Util.obj -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) +OBJS = $(COBJS) \ + $(SOBJS) !include $(top_srcdir)\config\Make.rules.mak @@ -64,13 +63,13 @@ ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc10" oraocci11$(LIBSUFF 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) +$(CLIENT): $(COBJS) + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) +$(SERVER): $(SOBJS) + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest @@ -81,5 +80,3 @@ DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ clean:: del /q HR.cpp HR.h del /q DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ - -!include .depend.mak diff --git a/cpp/demo/Database/Oracle/proc/.depend b/cpp/demo/Database/Oracle/proc/.depend deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Database/Oracle/proc/.depend +++ /dev/null diff --git a/cpp/demo/Database/Oracle/proc/.depend.mak b/cpp/demo/Database/Oracle/proc/.depend.mak deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Database/Oracle/proc/.depend.mak +++ /dev/null diff --git a/cpp/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile index 2cfaba5eebd..93fe15c317b 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile +++ b/cpp/demo/Database/Oracle/proc/Makefile @@ -14,8 +14,6 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -SLICE_SRCS = HR.ice - PROC_SRCS = CurrentSqlContext.pc \ DeptFactoryI.pc \ DeptI.pc \ @@ -23,17 +21,16 @@ PROC_SRCS = CurrentSqlContext.pc \ Server.pc \ Util.pc -OBJS = HR.o - -COBJS = Client.o +SLICE_OBJS = HR.o -SOBJS = $(PROC_SRCS:.pc=.o) - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) +COBJS = $(SLICE_OBJS) \ + Client.o +SOBJS = $(SLICE_OBJS) \ + $(PROC_SRCS:.pc=.o) +OBJS = $(COBJS) \ + $(SOBJS) include $(top_srcdir)/config/Make.rules @@ -53,15 +50,13 @@ ORACLE_LIBS = -L$(ORACLE_HOME)/lib -lclntsh proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $< rm -f tp* $*.lis -$(CLIENT): $(OBJS) $(COBJS) +$(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) -$(SERVER): $(OBJS) $(SOBJS) +$(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(ORACLE_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(ORACLE_LIBS) $(LIBS) clean:: -rm -f $(GENERATED_PROC_FILES) - -include .depend diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak index b9910b9c98a..532bb9537e7 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile.mak +++ b/cpp/demo/Database/Oracle/proc/Makefile.mak @@ -21,15 +21,16 @@ PROC_SRCS = CurrentSqlContext.pc \ Server.pc \ Util.pc -OBJS = HR.obj +SLICE_OBJS = HR.obj -COBJS = Client.obj +COBJS = $(SLICE_OBJS) \ + Client.obj -SOBJS = $(PROC_SRCS:.pc=.obj) +SOBJS = $(SLICE_OBJS) \ + $(PROC_SRCS:.pc=.obj) -SRCS = $(OBJS:.obj=.cpp) \ - $(COBJS:.obj=.cpp) \ - $(SOBJS:.obj=.cpp) +OBJS = $(COBJS) \ + $(SOBJS) !include $(top_srcdir)/config/Make.rules.mak @@ -53,18 +54,16 @@ CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif -$(CLIENT): $(OBJS) $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) +$(CLIENT): $(COBJS) + $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest -$(SERVER): $(OBJS) $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) +$(SERVER): $(SOBJS) + $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q HR.cpp HR.h del /q $(GENERATED_PROC_FILES) - -!include .depend.mak |