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-03 23:03:33.188011657 +0200 @@ -95,7 +95,7 @@ #ifndef NormalProgramTarget #define NormalProgramTarget(program,objects,deplibs,libs) \ ProgramTargetName(program): objects deplibs @@\ - $(LD) -o $@ $(LDFLAGS) objects libs + LD_LIBRARY_PATH=../shlib $(LD) -o $@ $(LDFLAGS) objects libs #endif #ifndef MakeSubdirs diff -ur lcgdm-1.8.1.2.orig/config/Imake.tmpl lcgdm-1.8.1.2/config/Imake.tmpl --- lcgdm-1.8.1.2.orig/config/Imake.tmpl 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/config/Imake.tmpl 2011-09-03 23:04:51.455986760 +0200 @@ -59,7 +59,7 @@ CP = cp #if !defined(SOLARIS) IDCMD = id -LD = cc +LD = $(CC) #else IDCMD = /usr/xpg4/bin/id #endif diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefile --- lcgdm-1.8.1.2.orig/dicomcopy/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/dicomcopy/Imakefile 2011-09-03 23:03:33.188011657 +0200 @@ -31,7 +31,7 @@ #if SOLARIS LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl -ldl #else -LIBS = -L../shlib -ldpm -llcgdm $(LIBCSEC) -ldl +LIBS = -L../shlib -ldpm -llcgdm -ldl #endif SPOOL = DicomcopySpool LOGFILE = FileName($(SPOOL),log) @@ -46,7 +46,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient DBCREAT = create_dicomcopy_tables_mysql.sql #else #if UsePostgres @@ -68,7 +68,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## @@ -153,7 +153,7 @@ NormalLibraryTarget(dicomcopy,dicomcopy_inc_reqctr.Osuf send2dicomcopyd.Osuf) SharedLibraryTargetName(dpm_dicom): dpm_dicomcopyfile.Osuf - $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf + $(LD) $(SHLIBLDFLAGS) -o $@ dpm_dicomcopyfile.Osuf -L../shlib -ldpm -llcgdm install: $(BIN) $(DPMSHAREDIR) $(SYSCONFDIR) $(IPROGS_D) $(SPOOL) 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-03 23:03:33.189011644 +0200 @@ -13,9 +13,9 @@ SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) #if SOLARIS -LIBS = -L../lib -llfc -ldl -lsocket -lnsl +LIBS = -L../shlib -llfc -llcgdm -lsocket -lnsl #else -LIBS = -L../lib -llfc -ldl +LIBS = -L../shlib -llfc -llcgdm #endif SPOOL = DliSpool LOGFILE = FileName($(SPOOL),log) @@ -60,7 +60,7 @@ $(CC) -c -g -I$(GSOAP_LOCATION)/include $(SOAPFLG) $(GSOAP_LOCATION)/src/stdsoap2.c NormalProgramTarget(lfc-dli,$(SRV_OBJS), $(DEPLIB), $(MTLDFLAGS) $(SOAPLIB) $(LIBS) $(MTLDLIBS)) -NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf $(STDSOAP_OBJS) dliC.Osuf dliClient.Osuf,$(DEPLIB),$(SOAPLIB) $(LIBS)) +NormalProgramTarget(lfc-dli-client,lfc-dli-client.Osuf $(STDSOAP_OBJS) dliC.Osuf dliClient.Osuf,$(DEPLIB),$(SOAPLIB)) rc.lfc-dli: lfc-dli.scripts sed -e 's#DPMCONFIGFILE=.*#DPMCONFIGFILE=$(DPMCONFIG)#' \ -e 's#PREFIX=.*#PREFIX=$(prefix)#' $? > $@ diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile --- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-05-31 12:22:45.000000000 +0200 +++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 23:03:33.190011631 +0200 @@ -45,12 +45,12 @@ #endif INCLUDES = FileName(..,h) #if SOLARIS -LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl +LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl #else #if _WIN32 LIBS = ..\lib\dpm.lib wsock32.lib advapi32.lib #else -LIBS = -L../lib -ldpm $(LIBCSEC) +LIBS = -L../shlib -ldpm -llcgdm #endif #endif LIBUUID = @@ -81,7 +81,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient DBCREAT = create_dpm_tables_mysql.sql #else #if UsePostgres @@ -113,7 +113,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## 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-03 23:03:33.190011631 +0200 @@ -27,7 +27,7 @@ #if EMIBuild GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common -GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client +GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client -lglobus_common #if UseVOMS VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(VOMS_LIB) $(GLOBUS_LIBS) @@ -40,7 +40,7 @@ VOMS_FLAVOUR=GlobusFlavour GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) -GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) +GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) #if UseVOMS VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS) @@ -52,9 +52,9 @@ SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) #if SOLARIS -LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl +LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl #else -LIBS = -L../lib -ldpm $(LIBCSEC) +LIBS = -L../shlib -ldpm -llcgdm #endif SPOOL = DpmcopySpool LOGFILE = FileName($(SPOOL),log) @@ -68,7 +68,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient #else #if UsePostgres DBOBJS = dpm_libpq_ifce.Osuf @@ -88,7 +88,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## diff -ur lcgdm-1.8.1.2.orig/lib/Imakefile lcgdm-1.8.1.2/lib/Imakefile --- lcgdm-1.8.1.2.orig/lib/Imakefile 2011-05-31 12:22:46.000000000 +0200 +++ lcgdm-1.8.1.2/lib/Imakefile 2011-09-03 23:03:33.191011618 +0200 @@ -34,7 +34,9 @@ install: $(LIB) FileName($(LIB),LibraryTargetName(dpm)) export: $(EXPORTLIB)/libdpm.a -#else +#endif +#endif + COMM Libraries to include in LibraryTargetame(lcgdm) all: LibraryTargetName(lcgdm) @@ -42,16 +44,14 @@ install: $(LIB) FileName($(LIB),LibraryTargetName(lcgdm)) export: $(EXPORTLIB)/liblcgdm.a -#endif -#endif exportman: exportshr: -liblfc.a: $(COMMONLIB) $(NSLIB) $(SECURITYLIB) +liblfc.a: $(NSLIB) -libdpm.a: $(COMMONLIB) $(RFIOLIB) $(NSLIB) $(DPMLIB) $(SECURITYLIB) +libdpm.a: $(RFIOLIB) $(NSLIB) $(DPMLIB) liblcgdm.a: $(COMMONLIB) $(SECURITYLIB) diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile --- lcgdm-1.8.1.2.orig/ns/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/ns/Imakefile 2011-09-03 23:03:33.192011604 +0200 @@ -45,27 +45,27 @@ INCLUDES = FileName(..,h) TOPLIBRARYNAME = TopLibraryName #if _AIX -LIBS = -L../lib -l$(TOPLIBRARYNAME) +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm #else #if defined(__alpha) && defined(__osf__) -LIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive +LIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -so_archive #else #if hpux -LIBS = -L../lib -l$(TOPLIBRARYNAME) +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm #else #if linux -LIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm #else #if sgi -LIBS = -L../lib -l$(TOPLIBRARYNAME) +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm #else #if SOLARIS -LIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lsocket -lnsl #else #if _WIN32 LIBS = ..\lib\$(TOPLIBRARYNAME).lib wsock32.lib advapi32.lib #else -LIBS = -L../lib -l$(TOPLIBRARYNAME) +LIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm #endif #endif #endif @@ -80,7 +80,7 @@ #if _WIN32 NSLIB = ns.lib #else -NSLIB = -L. -lns +NSLIB = #endif SPOOL = NsSpool LOGFILE = FileName($(SPOOL),log) @@ -107,7 +107,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient #else #if UsePostgres DBOBJS = Cns_libpq_ifce.Osuf diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.dpns lcgdm-1.8.1.2/ns/Imakefile.dpns --- lcgdm-1.8.1.2.orig/ns/Imakefile.dpns 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/ns/Imakefile.dpns 2011-09-03 23:03:33.192011604 +0200 @@ -22,7 +22,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## @@ -307,9 +307,9 @@ NormalProgramTarget(dpns-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) #if UseOracle && !defined(_WIN32) dpnsdaemon: $(NSDAEMON_OBJS) $(DEPLIB) - $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID)" + $(MAKE) -f oralink.mk dpnsdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID)" #else -NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) +NormalProgramTarget(dpnsdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) #endif NormalProgramTarget(dpns-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) NormalProgramTarget(dpns-enterusrmap,nsenterusrmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile.lfc lcgdm-1.8.1.2/ns/Imakefile.lfc --- lcgdm-1.8.1.2.orig/ns/Imakefile.lfc 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/ns/Imakefile.lfc 2011-09-03 23:03:33.193011590 +0200 @@ -33,7 +33,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,lfc) +DEPLIB = DepSharedLibraryTargetName(shlib,lfc) COMM######################### RULES ############################## @@ -378,9 +378,9 @@ NormalProgramTarget(lfc-chown,nschown.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) #if UseOracle && !defined(_WIN32) lfcdaemon: $(NSDAEMON_OBJS) $(DEPLIB) - $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(LIBS) $(MTLDLIBS) $(LIBUUID)" + $(MAKE) -f oralink.mk lfcdaemon NSDAEMON_OBJS="$(NSDAEMON_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="-L../shlib -llcgdm $(MTLDLIBS) $(LIBUUID)" #else -NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) $(LIBS) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) +NormalProgramTarget(lfcdaemon,$(NSDAEMON_OBJS), $(DEPLIB), $(MTLDFLAGS) -L../shlib -llcgdm $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS) $(LIBUUID)) #endif NormalProgramTarget(lfc-delcomment,nsdelcomment.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) NormalProgramTarget(lfc-entergrpmap,nsentergrpmap.Osuf,LibraryTargetName(ns) $(DEPLIB),$(NSLIB) $(LIBS)) diff -ur lcgdm-1.8.1.2.orig/rfio/Imakefile lcgdm-1.8.1.2/rfio/Imakefile --- lcgdm-1.8.1.2.orig/rfio/Imakefile 2011-05-31 12:22:45.000000000 +0200 +++ lcgdm-1.8.1.2/rfio/Imakefile 2011-09-03 23:03:33.194011577 +0200 @@ -94,24 +94,24 @@ #endif FFLAGS = $(FFOPTFLAGS) $(FPPUFL) #if defined(__alpha) && defined(__osf__) -LDLIBS = -no_so -L../lib -l$(TOPLIBRARYNAME) -so_archive +LDLIBS = -no_so -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -so_archive #else #if linux -LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(LIBCSEC) -lnsl $(MTLDLIBS) +LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS) #else #if SOLARIS -LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lsocket -lnsl +LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lsocket -lnsl #else #if sgi -LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS) +LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS) #else #if __Lynx__ -LDLIBS = -L../lib -l$(TOPLIBRARYNAME) -lnsl -lbsd +LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm -lnsl -lbsd #else #if _WIN32 LDLIBS = ..\lib\$(TOPLIBRARYNAME).lib ws2_32.lib advapi32.lib mpr.lib #else -LDLIBS = -L../lib -l$(TOPLIBRARYNAME) $(MTLDLIBS) +LDLIBS = -L../shlib -l$(TOPLIBRARYNAME) -llcgdm $(MTLDLIBS) #endif #endif #endif @@ -121,7 +121,7 @@ #if _WIN32 RFIOLIB = rfio.lib #else -RFIOLIB = -L. -lrfio +RFIOLIB = #endif LIBS = $(OPTLIBS) diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile --- lcgdm-1.8.1.2.orig/security/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/security/Imakefile 2011-09-03 23:03:33.195011564 +0200 @@ -57,12 +57,12 @@ #define SecAuthMechGSI -DGSI #if EMIBuild #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include $(VOMS_INCLUDE) -#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist $(VOMS_LIB) +#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto #else #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE) -#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) +#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto #define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE) -#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) $(VOMS_LIB) +#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto #endif #else #define GSIMech diff -ur lcgdm-1.8.1.2.orig/shlib/Imakefile lcgdm-1.8.1.2/shlib/Imakefile --- lcgdm-1.8.1.2.orig/shlib/Imakefile 2011-05-31 12:22:47.000000000 +0200 +++ lcgdm-1.8.1.2/shlib/Imakefile 2011-09-03 23:03:33.195011564 +0200 @@ -35,7 +35,6 @@ install: $(LIB) FileName($(LIB),SharedLibraryTargetName(dpm)) export: $(EXPORTLIB)/SharedLibraryTargetName(dpm) -#else #endif #endif @@ -60,7 +59,7 @@ @mkdir tmp @for i in $^ ;\ do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done - (cd tmp; $(CC) $(SHLIBLDFLAGS) SonameOption($@,`echo $(VERSION)|cut -f1 -d.`) -o ../$@ *.o $(SHLIBREQLIBS) -L.. -llcgdm $(LIBCSEC)) + (cd tmp; $(CC) $(SHLIBLDFLAGS) SonameOption($@,`echo $(VERSION)|cut -f1 -d.`) -o ../$@ *.o -L.. -llcgdm $(LIBCSEC)) @-rm -rf tmp liblcgdm.sl liblcgdm.so liblcgdm.dylib: $(COMMONLIB) $(SECURITYLIB) 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-03 23:03:33.196011551 +0200 @@ -53,9 +53,9 @@ SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) #if SOLARIS -LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl +LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl #else -LIBS = -L../lib -ldpm $(LIBCSEC) +LIBS = -L../shlib -ldpm -llcgdm #endif #ifndef darwin LIBS += -luuid @@ -72,7 +72,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient #else #if UsePostgres DBOBJS = ../dpm/dpm_libpq_ifce.Osuf @@ -92,7 +92,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## 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-03 23:03:33.197011538 +0200 @@ -53,9 +53,9 @@ SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) #if SOLARIS -LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl +LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl #else -LIBS = -L../lib -ldpm $(LIBCSEC) +LIBS = -L../shlib -ldpm -llcgdm #endif #ifndef darwin LIBS += -luuid @@ -72,7 +72,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient #else #if UsePostgres DBOBJS = ../dpm/dpm_libpq_ifce.Osuf @@ -92,7 +92,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## 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-03 23:03:33.198011525 +0200 @@ -54,9 +54,9 @@ INCLUDES = FileName(..,h) BACKEND_LIBS = DepLibraryTargetName(dpmcopy,dpmcopy) #if SOLARIS -LIBS = -L../lib -ldpm $(LIBCSEC) -lsocket -lnsl +LIBS = -L../shlib -ldpm -llcgdm -lsocket -lnsl #else -LIBS = -L../lib -ldpm $(LIBCSEC) +LIBS = -L../shlib -ldpm -llcgdm #endif #ifndef darwin LIBS += -luuid @@ -73,7 +73,7 @@ MYSFLG = -DUSE_MYSQL MYSQL_LOCATION = MySQLLocation MYSINC = -I$(MYSQL_LOCATION)/include/mysql -LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient -lz -lm +LIBMYS = -L$(MYSQL_LOCATION)/$(_lib)/mysql -lmysqlclient #else #if UsePostgres DBOBJS = ../dpm/dpm_libpq_ifce.Osuf @@ -93,7 +93,7 @@ COMM######################### DEPENDENCY LIBRARIES ############### -DEPLIB = DepLibraryTargetName(lib,dpm) +DEPLIB = DepSharedLibraryTargetName(shlib,dpm) COMM######################### RULES ############################## @@ -133,9 +133,9 @@ #if UseOracle && !defined(_WIN32) srmv2.2: $(SRV_OBJS) $(DEPLIB) $(BACKEND_LIBS) - $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(SOAPLIB) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS)" + $(MAKE) -f oralink.mk srmv2.2 SRV_OBJS="$(SRV_OBJS)" CLDFLAGS=$(MTLDFLAGS) LIBS="$(SOAPLIB) $(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS)" #else -NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(SOAPLIB) $(LIBS) $(BACKEND_LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) +NormalProgramTarget(srmv2.2,$(SRV_OBJS), $(DEPLIB) $(BACKEND_LIBS), $(MTLDFLAGS) $(SOAPLIB) $(BACKEND_LIBS) $(LIBS) $(SECLIB) $(MTLDLIBS) $(LIBORA) $(LIBMYS) $(LIBPOS)) #endif #if UseOracle rc.srmv2.2: srmv2.2.scripts.oracle
