diff -ur lcgdm-1.7.4.4.orig/dli/Imakefile lcgdm-1.7.4.4/dli/Imakefile
--- lcgdm-1.7.4.4.orig/dli/Imakefile 2010-04-03 10:31:57.057794667 +0200
+++ lcgdm-1.7.4.4/dli/Imakefile 2010-04-03 10:36:09.809544645 +0200
@@ -48,21 +48,18 @@
SRV_OBJS = dli.Osuf \
dlilogit.Osuf \
dliC.Osuf \
- dliServer.Osuf \
- stdsoap2.Osuf
+ dliServer.Osuf
all: $(SERVER) $(CLIENT)
-dliH.h dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: DataLocationInterface.h
+dliStub.h dliC.c dliClient.c dliServer.c DataLocationInterface.nsmap: dliH.h
+dliH.h: DataLocationInterface.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p dli DataLocationInterface.h
DataLocationInterface.h: DataLocationInterface.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -t typemap.dat DataLocationInterface.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
-NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS))
-NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf stdsoap2.Osuf,$(DEPLIB),)
+NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) -lgsoap)
+NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf dliC.Osuf dliClient.Osuf,$(DEPLIB),-lgsoap)
rc.lfc-dli: lfc-dli.scripts
$(CP) $? $@
lfc-dli.conf.templ: lfc-dli.sysconfig
@@ -110,5 +107,6 @@
COMM###################### DEPENDENCIES ##########################
dli.Osuf: dliH.h DataLocationInterface.nsmap
+lfc-dli-client.Osuf: dliH.h DataLocationInterface.nsmap
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/dpmcopy/Imakefile lcgdm-1.7.4.4/dpmcopy/Imakefile
--- lcgdm-1.7.4.4.orig/dpmcopy/Imakefile 2010-04-03 10:31:57.058794443 +0200
+++ lcgdm-1.7.4.4/dpmcopy/Imakefile 2010-04-03 10:32:25.308544823 +0200
@@ -96,8 +96,7 @@
../dpm/dpmlogit.Osuf \
../dpm/sendrep.Osuf \
srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
all: $(SERVER)
@@ -119,7 +118,8 @@
proc INAME=dpm_oracle_ifce INCLUDE=$(INCLUDES) CHAR_MAP=STRING PARSE=FULL $(WNT_SYS_INCLUDE)
#define YES 1
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srm.v2.2.h
+srmv2Stub.h srmv2C.c srmv2Client.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.2.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
@@ -130,14 +130,12 @@
$(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c
send2dpmcopyd.Osuf: send2dpmcopyd.c
$(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) send2dpmcopyd.c
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
#if UseOracle && !defined(_WIN32)
dpmcopyd: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB)"
+ $(MAKE) -f oralink.mk dpmcopyd SRV_OBJS="$(SRV_OBJS)" LIBS="$(GGC_LIB) $(LIBS) $(SECLIB) -lgsoap"
#else
-NormalProgramTarget(dpmcopyd,$(SRV_OBJS), $(DEPLIB), $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(dpmcopyd,$(SRV_OBJS), $(DEPLIB), $(GGC_LIB) $(LIBS) $(SECLIB) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.dpmcopyd: dpmcopyd.scripts.oracle
diff -ur lcgdm-1.7.4.4.orig/srmv1/Imakefile lcgdm-1.7.4.4/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/srmv1/Imakefile 2010-04-03 10:31:57.060793436 +0200
+++ lcgdm-1.7.4.4/srmv1/Imakefile 2010-04-03 10:32:25.308544823 +0200
@@ -100,24 +100,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv1C.Osuf \
- srmv1Server.Osuf \
- stdsoap2.Osuf
+ srmv1Server.Osuf
all: $(SERVER)
-srmv1H.h srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srm.v1.1.h
+srmv1Stub.h srmv1C.c srmv1Server.c ISRM.nsmap: srmv1H.h
+srmv1H.h: srm.v1.1.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv1 srm.v1.1.h
srm.v1.1.h: srm.v1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -w -y -t typemap.dat srm.v1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv1: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv1 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv1,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv1,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv1: srmv1.scripts.oracle
@@ -180,5 +177,6 @@
COMM###################### DEPENDENCIES ##########################
srmv1.Osuf: srmv1H.h ISRM.nsmap
+srmv1_procreq.Osuf: srmv1H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/srmv2/Imakefile lcgdm-1.7.4.4/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2/Imakefile 2010-04-03 10:31:57.060793436 +0200
+++ lcgdm-1.7.4.4/srmv2/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -104,24 +104,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv2C.Osuf \
- srmv2Server.Osuf \
- stdsoap2.Osuf
+ srmv2Server.Osuf
all: $(SERVER)
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.1.1.h
+srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.1.1.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.1.1.h
srm.v2.1.1.h: srm.v2.1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv2: $(SRV_OBJS) $(DEPLIB)
- $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv2,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv2,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv2: srmv2.scripts.oracle
@@ -184,5 +181,9 @@
COMM###################### DEPENDENCIES ##########################
srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
+srmv2_dirreq.Osuf: srmv2H.h
+srmv2_permreq.Osuf: srmv2H.h
+srmv2_spacereq.Osuf: srmv2H.h
+srmv2_xferreq.Osuf: srmv2H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/srmv2.2/Imakefile lcgdm-1.7.4.4/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/srmv2.2/Imakefile 2010-04-03 10:31:57.061793143 +0200
+++ lcgdm-1.7.4.4/srmv2.2/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -106,24 +106,21 @@
../dpm/dpm_util.Osuf \
../dpm/dpmlogit.Osuf \
srmv2C.Osuf \
- srmv2Server.Osuf \
- stdsoap2.Osuf
+ srmv2Server.Osuf
all: $(SERVER)
-srmv2H.h srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srm.v2.2.h
+srmv2Stub.h srmv2C.c srmv2Server.c srmSoapBinding.nsmap: srmv2H.h
+srmv2H.h: srm.v2.2.h
$(GSOAP_LOCATION)/bin/soapcpp2 -c -p srmv2 srm.v2.2.h
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
#if UseOracle && !defined(_WIN32)
srmv2.2: $(SRV_OBJS) $(DEPLIB) $(BACKEND_LIBS)
- $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS)"
+ $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) -lgsoap"
#else
-NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS))
+NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) -lgsoap)
#endif
#if UseOracle
rc.srmv2.2: srmv2.2.scripts.oracle
@@ -188,5 +185,10 @@
COMM###################### DEPENDENCIES ##########################
srmv2.Osuf: srmv2H.h srmSoapBinding.nsmap
+srmv2_dirreq.Osuf: srmv2H.h
+srmv2_discovreq.Osuf: srmv2H.h
+srmv2_permreq.Osuf: srmv2H.h
+srmv2_spacereq.Osuf: srmv2H.h
+srmv2_xferreq.Osuf: srmv2H.h
COMM DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ur lcgdm-1.7.4.4.orig/test/srmv1/Imakefile lcgdm-1.7.4.4/test/srmv1/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv1/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv1/Imakefile 2010-04-03 10:32:25.309544599 +0200
@@ -40,8 +40,7 @@
srmv1Stress
SOAP_OBJS = srmv1C.Osuf \
- srmv1Client.Osuf \
- stdsoap2.Osuf
+ srmv1Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv1),$(PROGS) $(SCRIPTS))
@@ -52,9 +51,6 @@
srm.v1.1.h: srm.v1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -w -y -t typemap.dat srm.v1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
install: $(PROGSBIN)
install.man:
@@ -64,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2/Imakefile lcgdm-1.7.4.4/test/srmv2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv2/Imakefile 2010-04-03 10:32:25.310544654 +0200
@@ -40,8 +40,7 @@
srmv2Stress
SOAP_OBJS = srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv2),$(PROGS) $(SCRIPTS))
@@ -52,10 +51,6 @@
srm.v2.1.1.h: srm.v2.1.1.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.1.1.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
-
install: $(PROGSBIN)
install.man:
@@ -65,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################
diff -ur lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile lcgdm-1.7.4.4/test/srmv2.2/Imakefile
--- lcgdm-1.7.4.4.orig/test/srmv2.2/Imakefile 2010-04-03 10:31:45.412799166 +0200
+++ lcgdm-1.7.4.4/test/srmv2.2/Imakefile 2010-04-03 10:32:25.310544654 +0200
@@ -40,8 +40,7 @@
srmv2Stress
SOAP_OBJS = srmv2C.Osuf \
- srmv2Client.Osuf \
- stdsoap2.Osuf
+ srmv2Client.Osuf
PROGSBIN = $(addprefix $(prefixsrmv2.2),$(PROGS) $(SCRIPTS))
@@ -52,9 +51,6 @@
srm.v2.2.h: srm.v2.2.wsdl
$(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl
-stdsoap2.Osuf: $(GSOAP_LOCATION)/src/stdsoap2.c
- $(CC) -c -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c
-
install: $(PROGSBIN)
install.man:
@@ -64,7 +60,7 @@
$(PROGS): %: %.Osuf $(SOAP_OBJS) $(DEPLIBS)
### @echo "========================g" $@
- $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB)
+ $(CC) -o $@ $(LDFLAGS) $< $(SOAP_OBJS) $(LIBS) $(SECLIB) -lgsoap
COMM###################### CLEANING RULES ########################