diff options
Diffstat (limited to 'cpp/demo/Database/Oracle')
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/Makefile | 14 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/occi/Makefile.mak | 18 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/Makefile | 16 | ||||
| -rw-r--r-- | cpp/demo/Database/Oracle/proc/Makefile.mak | 18 |
4 files changed, 33 insertions, 33 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 |