diff -ur lcgdm-1.8.1.2.orig/config/Imake.rules lcgdm-1.8.1.2/config/Imake.rules --- lcgdm-1.8.1.2.orig/config/Imake.rules 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/config/Imake.rules 2011-09-02 16:59:34.197572637 +0200 @@ -11,19 +11,19 @@ #if UseNroff #define IMANPAGE(name,dir,suffix) \ -dir/name.suffix: name.man @@\ +dir/name.suffix: dir name.man @@\ nroff -man name.man > dir/name.suffix #define FILTERMANPAGE(new_command,command,dir,suffix) \ -dir/new_command.suffix: command.man @@\ +dir/new_command.suffix: dir command.man @@\ ../scripts/filter-manpage.sh new_command command dir suffix #else #define IMANPAGE(name,dir,suffix) \ -dir/name.suffix: name.man @@\ +dir/name.suffix: dir name.man @@\ cp name.man dir/name.suffix #define FILTERMANPAGE(new_command,command,dir,suffix) \ -dir/new_command.suffix: command.man @@\ +dir/new_command.suffix: dir command.man @@\ ../scripts/filter-manpage-nroff.sh new_command command dir suffix #endif @@ -126,9 +126,9 @@ #ifndef InstallTarget #define InstallTarget(file,owner,group,mode,dest) @@\ -dest/file: file @@\ - -mv $@ dest/OLD$? @@\ - cp $? $@ @@\ +dest/file: dest file @@\ + -mv $@ dest/OLD/**/file @@\ + cp file $@ @@\ if [ `$(IDCMD) -u` = 0 ]; then \ @@\ chown owner $@ ; \ @@\ chgrp group $@ ; \ @@\ @@ -138,10 +138,10 @@ #ifndef InstallLibrary #define InstallLibrary(libname,dest,owner,group,mode) @@\ -dest/LibraryTargetName(libname): LibraryTargetName(libname) @@\ - -mv $@ dest/OLD$? @@\ - cp $? $@ @@\ - @$(RANLIB) $(LIB)/$? @@\ +dest/LibraryTargetName(libname): dest LibraryTargetName(libname) @@\ + -mv $@ dest/OLD/**/LibraryTargetName(libname) @@\ + cp LibraryTargetName(libname) $@ @@\ + @$(RANLIB) $@ @@\ if [ `$(IDCMD) -u` = 0 ]; then \ @@\ chown owner $@ ; \ @@\ chgrp group $@ ; \ @@\ @@ -157,12 +157,12 @@ #ifndef InstallSharedLibrary #define InstallSharedLibrary(libname,rev,dest) @@\ -dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\ - cp $? $@.rev @@\ +dest/SharedLibraryTargetName(libname): dest SharedLibraryTargetName(libname) @@\ + cp SharedLibraryTargetName(libname) $@.rev @@\ -rm $@ @@\ - ln -s $?.rev $@ @@\ + ln -s SharedLibraryTargetName(libname).rev $@ @@\ -rm $@.`echo rev|cut -f1 -d.` @@\ - ln -s $?.rev $@.`echo rev|cut -f1 -d.` + ln -s SharedLibraryTargetName(libname).rev $@.`echo rev|cut -f1 -d.` #endif #ifndef MakeDir diff -ur lcgdm-1.8.1.2.orig/dli/Imakefile lcgdm-1.8.1.2/dli/Imakefile --- lcgdm-1.8.1.2.orig/dli/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/dli/Imakefile 2011-09-02 17:02:05.716604006 +0200 @@ -51,7 +51,8 @@ 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 @@ -109,5 +110,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.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile --- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-05-31 12:22:46.000000000 +0200 +++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-02 17:03:30.340507341 +0200 @@ -134,7 +134,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 diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile --- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-02 17:04:34.996672064 +0200 @@ -117,7 +117,8 @@ 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 @@ -195,5 +196,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.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile --- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-02 17:05:45.268764203 +0200 @@ -121,7 +121,8 @@ 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 @@ -199,5 +200,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.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile --- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-05-31 12:22:46.000000000 +0200 +++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-02 17:06:49.942928633 +0200 @@ -123,7 +123,8 @@ 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 @@ -203,5 +204,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.