File sblim-gather-2.1.5-linkerpaths.patch of Package sblim-gather
---
Makefile.am | 70 +++++++++++++++++++++++++--------------------------
provider/Makefile.am | 20 +++++++-------
2 files changed, 45 insertions(+), 45 deletions(-)
--- Makefile.am.orig
+++ Makefile.am
@@ -86,29 +86,29 @@ libgatherutil_la_CPPFLAGS = $(AM_CPPFLAG
libmcserv_la_SOURCES = comms/mcclt_unix.c comms/mcserv_unix.c
libmcserv_la_CPPFLAGS = $(AM_CPPFLAGS) -DGATHER_RUNDIR=\"$(gatherrundir)\"
-libmcserv_la_LIBADD = -lgatherutil
+libmcserv_la_LIBADD = $(srcdir)/libgatherutil.la
libmcserv_la_DEPENDENCIES = libgatherutil.la
librcserv_la_SOURCES = comms/rcclt_ip.c comms/rcserv_ip.c
-librcserv_la_LIBADD = -lgatherutil
+librcserv_la_LIBADD = $(srcdir)/libgatherutil.la
librcserv_la_DEPENDENCIES = libgatherutil.la
librrepos_la_SOURCES = rrepos.c marshal.c slisten.c
-librrepos_la_LIBADD = -lgatherutil -lmcserv -lrcserv
+librrepos_la_LIBADD = $(srcdir)/libgatherutil.la $(srcdir)/libmcserv.la $(srcdir)/librcserv.la
librrepos_la_DEPENDENCIES = libgatherutil.la libmcserv.la librcserv.la
librepos_la_SOURCES = repos.c mreposl.c rplugmgr.c rreg.c marshal.c
librepos_la_CPPFLAGS = $(AM_CPPFLAGS) -DREPOS_PLUGINDIR=\"$(reposplugindir)\"
-librepos_la_LIBADD = -lgatherutil
+librepos_la_LIBADD = $(srcdir)/libgatherutil.la
librepos_la_DEPENDENCIES = libgatherutil.la
librgather_la_SOURCES = rgather.c
-librgather_la_LIBADD = -lgatherutil -lmcserv
+librgather_la_LIBADD = $(srcdir)/libgatherutil.la $(srcdir)/libmcserv.la
librgather_la_DEPENDENCIES = libgatherutil.la libmcserv.la
libgather_la_SOURCES = mlist.c mretr.c mplugmgr.c mreg.c mreposp.c gather.c
libgather_la_CPPFLAGS = $(AM_CPPFLAGS) -DGATHER_PLUGINDIR=\"$(metricplugindir)\"
-libgather_la_LIBADD = -lrrepos -lgatherutil
+libgather_la_LIBADD = $(srcdir)/librrepos.la $(srcdir)/libgatherutil.la
libgather_la_DEPENDENCIES = librrepos.la libgatherutil.la
# Plugin Utility
@@ -122,29 +122,29 @@ liblparutil_la_LIBADD = -lhypfs
liblparutil_la_DEPENDENCIES = libhypfs.la
libchannelutil_la_SOURCES = plugin/channelutil.c plugin/channelutil.h
-libchannelutil_la_LIBADD = -lsysfs -lsysfswrapper
+libchannelutil_la_LIBADD = -lsysfs $(srcdir)/libsysfswrapper.la
libchannelutil_la_DEPENDENCIES = libsysfswrapper.la
# Gather daemons
sbin_PROGRAMS = gatherd reposd
gatherd_SOURCES = gatherd.c
-gatherd_LDADD = -lgather -lmcserv
+gatherd_LDADD = $(srcdir)/libgather.la $(srcdir)/libmcserv.la
gatherd_DEPENDENCIES = libgather.la libmcserv.la
reposd_SOURCES = reposd.c sforward.c
-reposd_LDADD = -lrepos -lmcserv -lrcserv
+reposd_LDADD = $(srcdir)/librepos.la $(srcdir)/libmcserv.la $(srcdir)/librcserv.la
reposd_DEPENDENCIES = librepos.la libmcserv.la librcserv.la
# Gather CLIs
bin_PROGRAMS = gatherctl reposctl reposdump
gatherctl_SOURCES = gatherctl.c
-gatherctl_LDADD = -lrgather
+gatherctl_LDADD = $(srcdir)/librgather.la
gatherctl_DEPENDENCIES = librgather.la
reposctl_SOURCES = reposctl.c
-reposctl_LDADD = -lrrepos
+reposctl_LDADD = $(srcdir)/librrepos.la
reposctl_DEPENDENCIES = librrepos.la
reposdump_SOURCES = reposdump.c
@@ -166,21 +166,21 @@ metricplugin_LTLIBRARIES = libmetricOper
libmetriczCH.la
libmetricOperatingSystem_la_SOURCES=plugin/metricOperatingSystem.c
-libmetricOperatingSystem_la_LIBADD=-lgatherutil
+libmetricOperatingSystem_la_LIBADD=$(srcdir)/libgatherutil.la
libmetricOperatingSystem_la_DEPENDENCIES=libgatherutil.la
libmetricLocalFileSystem_la_SOURCES=plugin/metricLocalFileSystem.c
-libmetricLocalFileSystem_la_LIBADD=-lgatherutil
+libmetricLocalFileSystem_la_LIBADD=$(srcdir)/libgatherutil.la
libmetricLocalFileSystem_la_DEPENDENCIES=libgatherutil.la
libmetricUnixProcess_la_SOURCES=plugin/metricUnixProcess.c
libmetricProcessor_la_SOURCES=plugin/metricProcessor.c
-libmetricProcessor_la_LIBADD=-lgatherutil
+libmetricProcessor_la_LIBADD=$(srcdir)/libgatherutil.la
libmetricProcessor_la_DEPENDENCIES=libgatherutil.la
libmetricXen_la_SOURCES=plugin/metricXen.c
-libmetricXen_la_LIBADD=-lgatherutil
+libmetricXen_la_LIBADD=$(srcdir)/libgatherutil.la
libmetricXen_la_DEPENDENCIES=libgatherutil.la
libmetricNetworkPort_la_SOURCES=plugin/metricNetworkPort.c
@@ -188,19 +188,19 @@ libmetricNetworkPort_la_SOURCES=plugin/m
libmetricIPProtocolEndpoint_la_SOURCES=plugin/metricIPProtocolEndpoint.c
libmetriczECKD_la_SOURCES=plugin/metriczECKD.c
-libmetriczECKD_la_LIBADD=-lsysfswrapper -lgatherutil
+libmetriczECKD_la_LIBADD=$(srcdir)/libsysfswrapper.la $(srcdir)/libgatherutil.la
libmetriczECKD_la_DEPENDENCIES=libsysfswrapper.la
libmetriczLPAR_la_SOURCES=plugin/metriczLPAR.c
-libmetriczLPAR_la_LIBADD=-llparutil -lgatherutil
+libmetriczLPAR_la_LIBADD=$(srcdir)/liblparutil.la $(srcdir)/libgatherutil.la
libmetriczLPAR_la_DEPENDENCIES=liblparutil.la
libmetriczCEC_la_SOURCES=plugin/metriczCEC.c
-libmetriczCEC_la_LIBADD=-llparutil -lgatherutil
+libmetriczCEC_la_LIBADD=$(srcdir)/liblparutil.la $(srcdir)/libgatherutil.la
libmetriczCEC_la_DEPENDENCIES=liblparutil.la
libmetriczCH_la_SOURCES=plugin/metriczCH.c
-libmetriczCH_la_LIBADD=-lchannelutil -lgatherutil
+libmetriczCH_la_LIBADD=$(srcdir)/libchannelutil.la $(srcdir)/libgatherutil.la
libmetriczCH_la_DEPENDENCIES=libchannelutil.la
reposplugin_LTLIBRARIES = librepositoryOperatingSystem.la \
@@ -216,37 +216,37 @@ reposplugin_LTLIBRARIES = librepositoryO
librepositoryzCH.la
librepositoryOperatingSystem_la_SOURCES=plugin/repositoryOperatingSystem.c
-librepositoryOperatingSystem_la_LIBADD=-lgatherutil
+librepositoryOperatingSystem_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryOperatingSystem_la_DEPENDENCIES=libgatherutil.la
librepositoryLocalFileSystem_la_SOURCES=plugin/repositoryLocalFileSystem.c
-librepositoryLocalFileSystem_la_LIBADD=-lgatherutil
+librepositoryLocalFileSystem_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryLocalFileSystem_la_DEPENDENCIES=libgatherutil.la
librepositoryUnixProcess_la_SOURCES=plugin/repositoryUnixProcess.c
librepositoryProcessor_la_SOURCES=plugin/repositoryProcessor.c
-librepositoryProcessor_la_LIBADD=-lgatherutil
+librepositoryProcessor_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryProcessor_la_DEPENDENCIES=libgatherutil.la
librepositoryXen_la_SOURCES=plugin/repositoryXen.c
-librepositoryXen_la_LIBADD=-lgatherutil
+librepositoryXen_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryXen_la_DEPENDENCIES=libgatherutil.la
librepositoryNetworkPort_la_SOURCES=plugin/repositoryNetworkPort.c
librepositoryIPProtocolEndpoint_la_SOURCES=plugin/repositoryIPProtocolEndpoint.c
librepositoryzECKD_la_SOURCES=plugin/repositoryzECKD.c
-librepositoryzECKD_la_LIBADD=-lgatherutil
+librepositoryzECKD_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryzLPAR_la_SOURCES=plugin/repositoryzLPAR.c
-librepositoryzLPAR_la_LIBADD=-lgatherutil
+librepositoryzLPAR_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryzCEC_la_SOURCES=plugin/repositoryzCEC.c
-librepositoryzCEC_la_LIBADD=-lgatherutil
+librepositoryzCEC_la_LIBADD=$(srcdir)/libgatherutil.la
librepositoryzCH_la_SOURCES=plugin/repositoryzCH.c
-librepositoryzCH_la_LIBADD=-lchannelutil -lgatherutil -lm
+librepositoryzCH_la_LIBADD=$(srcdir)/libchannelutil.la $(srcdir)/libgatherutil.la -lm
librepositoryzCH_la_DEPENDENCIES=libchannelutil.la
# Gather utility test programs (not installed)
@@ -255,31 +255,31 @@ noinst_PROGRAMS = mcfgtest mtracetest me
hyptest channelclt
mcfgtest_SOURCES = util/mcfgtest.c
-mcfgtest_LDADD = -lgatherutil
+mcfgtest_LDADD = $(srcdir)/libgatherutil.la
mcfgtest_DEPENDENCIES = libgatherutil.la
mtracetest_SOURCES = util/mtracetest.c
-mtracetest_LDADD = -lgatherutil
+mtracetest_LDADD = $(srcdir)/libgatherutil.la
mtracetest_DEPENDENCIES = libgatherutil.la
merrnotest_SOURCES = util/merrnotest.c
-merrnotest_LDADD = -lgatherutil
+merrnotest_LDADD = $(srcdir)/libgatherutil.la
merrnotest_DEPENDENCIES = libgatherutil.la
mcstest_SOURCES = comms/mcstest.c
-mcstest_LDADD = -lmcserv
+mcstest_LDADD = $(srcdir)/libmcserv.la
mcstest_DEPENDENCIES = libmcserv.la
mcctest_SOURCES = comms/mcctest.c
-mcctest_LDADD = -lmcserv
+mcctest_LDADD = $(srcdir)/libmcserv.la
mcctest_DEPENDENCIES = libmcserv.la
rcstest_SOURCES = comms/rcstest.c
-rcstest_LDADD = -lrcserv
+rcstest_LDADD = $(srcdir)/librcserv.la
rcstest_DEPENDENCIES = librcserv.la
rcctest_SOURCES = comms/rcctest.c
-rcctest_LDADD = -lrcserv
+rcctest_LDADD = $(srcdir)/librcserv.la
rcctest_DEPENDENCIES = librcserv.la
EXTRA_DIST += util/test.cfg
@@ -291,7 +291,7 @@ hyptest_LDADD = -lhypfs
hyptest_DEPENDENCIES = libhypfs.la
channelclt_SOURCES = plugin/channelclt.c
-channelclt_LDADD = -lsysfs -lchannelutil -lsysfswrapper
+channelclt_LDADD = -lsysfs $(srcdir)/libchannelutil.la $(srcdir)/libsysfswrapper.la
channelclt_DEPENDENCIES = libsysfswrapper.la libchannelutil.la
# Gather config files
--- provider/Makefile.am.orig
+++ provider/Makefile.am
@@ -41,7 +41,7 @@ providerdir = @PROVIDERDIR@
# Generally useful flags
AM_CPPFLAGS = -I $(srcdir)/.. -I $(srcdir)/../util -I $(srcdir)/../comms
AM_CFLAGS = -Wall
-AM_LDFLAGS = -L..
+#AM_LDFLAGS = -L..
# Include files
noinst_HEADERS = OSBase_MetricUtil.h
@@ -75,7 +75,7 @@ libcimplugzLPAR_la_SOURCES=$(srcdir)/../
lib_LTLIBRARIES = libOSBase_MetricUtil.la
libOSBase_MetricUtil_la_SOURCES=OSBase_MetricUtil.c
libOSBase_MetricUtil_la_CPPFLAGS= $(AM_CPPFLAGS) -DCIM_PLUGINDIR=\"$(cimplugindir)\"
-libOSBase_MetricUtil_la_LIBADD=-lrrepos -lcmpiOSBase_Common
+libOSBase_MetricUtil_la_LIBADD=$(srcdir)/../librrepos.la -lcmpiOSBase_Common
# Gather CMPI provider libraries
provider_LTLIBRARIES = libOSBase_MetricDefinitionProvider.la \
@@ -89,35 +89,35 @@ provider_LTLIBRARIES = libOSBase_MetricD
libOSBase_MetricLifeCycleProvider.la
libOSBase_MetricDefinitionProvider_la_SOURCES = OSBase_MetricDefinitionProvider.c
-libOSBase_MetricDefinitionProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricDefinitionProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricDefinitionProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricValueProvider_la_SOURCES = OSBase_MetricValueProvider.c
-libOSBase_MetricValueProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricValueProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricValueProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricGathererProvider_la_SOURCES = OSBase_MetricGathererProvider.c
-libOSBase_MetricGathererProvider_la_LIBADD = -lOSBase_MetricUtil -lrgather @LIBSBLIMBASE@
+libOSBase_MetricGathererProvider_la_LIBADD = libOSBase_MetricUtil.la $(srcdir)/../librgather.la @LIBSBLIMBASE@
libOSBase_MetricGathererProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricRepositoryServiceProvider_la_SOURCES = OSBase_MetricRepositoryServiceProvider.c
-libOSBase_MetricRepositoryServiceProvider_la_LIBADD = -lOSBase_MetricUtil @LIBSBLIMBASE@
+libOSBase_MetricRepositoryServiceProvider_la_LIBADD = libOSBase_MetricUtil.la @LIBSBLIMBASE@
libOSBase_MetricRepositoryServiceProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricForMEProvider_la_SOURCES = OSBase_MetricForMEProvider.c
-libOSBase_MetricForMEProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricForMEProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricForMEProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricDefForMEProvider_la_SOURCES = OSBase_MetricDefForMEProvider.c
-libOSBase_MetricDefForMEProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricDefForMEProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricDefForMEProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricInstanceProvider_la_SOURCES = OSBase_MetricInstanceProvider.c
-libOSBase_MetricInstanceProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricInstanceProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricInstanceProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricIndicationProvider_la_SOURCES = OSBase_MetricIndicationProvider.c
-libOSBase_MetricIndicationProvider_la_LIBADD = -lOSBase_MetricUtil
+libOSBase_MetricIndicationProvider_la_LIBADD = libOSBase_MetricUtil.la
libOSBase_MetricIndicationProvider_la_DEPENDENCIES = libOSBase_MetricUtil.la
libOSBase_MetricLifeCycleProvider_la_SOURCES = OSBase_MetricLifeCycleProvider.c
