From: <av...@us...> - 2010-06-15 21:24:51
|
Revision: 7108 http://openhpi.svn.sourceforge.net/openhpi/?rev=7108&view=rev Author: avpak Date: 2010-06-15 21:24:40 +0000 (Tue, 15 Jun 2010) Log Message: ----------- Fix for #3014969 Modified Paths: -------------- openhpi/trunk/Makefile.am openhpi/trunk/openhpid/Makefile.am openhpi/trunk/openhpid/t/ohpi/Makefile.am openhpi/trunk/plugins/ipmi/t/Makefile.am openhpi/trunk/plugins/simulator/t/Makefile.am openhpi/trunk/plugins/snmp_bc/t/Makefile.am Modified: openhpi/trunk/Makefile.am =================================================================== --- openhpi/trunk/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -54,8 +54,8 @@ MOSTLYCLEANFILES = tags -SUBDIRS = utils scripts @SSLDIR@ @SNMPDIR@ transport marshal baselib plugins docs @ENABLED_DIRS@ hpi_shell -DIST_SUBDIRS = utils scripts snmp ssl transport marshal baselib plugins docs openhpid clients cpp hpi_shell +SUBDIRS = utils scripts @SSLDIR@ @SNMPDIR@ transport marshal baselib @ENABLED_DIRS@ plugins docs hpi_shell +DIST_SUBDIRS = utils scripts snmp ssl transport marshal baselib openhpid plugins docs clients cpp hpi_shell DISTCHECK_CONFIGURE_FLAGS = --with-initdir=prefix Modified: openhpi/trunk/openhpid/Makefile.am =================================================================== --- openhpi/trunk/openhpid/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/openhpid/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -26,30 +26,39 @@ EXTRA_DIST = \ openhpid.sh.in +# daemon library +noinst_LTLIBRARIES = libopenhpidaemon.la +libopenhpidaemon_la_SOURCES = config.c \ + domain.c \ + event.c \ + threaded.c \ + alarm.c \ + hotswap.c \ + lock.c \ + plugin.c \ + plugin_static.c \ + init.c \ + safhpi.c \ + session.c \ + ohpi.c + +libopenhpidaemon_la_LIBADD = $(top_builddir)/utils/libopenhpiutils.la \ + $(top_builddir)/marshal/libopenhpimarshal.la \ + $(top_builddir)/transport/libopenhpitransport.la +if HAVE_OPENSSL +libopenhpidaemon_la_LIBADD += $(top_builddir)/$(SSLDIR)/libopenhpi_ssl.la +endif +libopenhpidaemon_la_LDFLAGS = -version-info @HPI_LIB_VERSION@ + # daemon sbin_PROGRAMS = openhpid -openhpid_SOURCES = config.c \ - domain.c \ - event.c \ - threaded.c \ - alarm.c \ - hotswap.c \ - lock.c \ - plugin.c \ - plugin_static.c \ - init.c \ - safhpi.c \ - session.c \ - ohpi.c \ - openhpid.cpp +openhpid_SOURCES = openhpid.cpp - - -openhpid_LDADD = $(top_builddir)/baselib/libopenhpi.la \ - $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/marshal/libopenhpimarshal.la \ - $(top_builddir)/transport/libopenhpitransport.la +openhpid_LDADD = libopenhpidaemon.la \ + $(top_builddir)/utils/libopenhpiutils.la \ + $(top_builddir)/marshal/libopenhpimarshal.la \ + $(top_builddir)/transport/libopenhpitransport.la if HAVE_OPENSSL openhpid_LDADD += $(top_builddir)/$(SSLDIR)/libopenhpi_ssl.la endif Modified: openhpi/trunk/openhpid/t/ohpi/Makefile.am =================================================================== --- openhpi/trunk/openhpid/t/ohpi/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/openhpid/t/ohpi/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -15,13 +15,13 @@ INCLUDES = @OPENHPI_INCLUDES@ -TDEPLIB = $(top_builddir)/baselib/libopenhpi.la \ +TDEPLIB = $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/utils/libopenhpiutils.la TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator:$(top_builddir)/plugins/watchdog -TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(top_builddir)/src/t/ohpi/uid_map -TESTS_ENVIRONMENT += OPENHPI_CONF=$(top_srcdir)/src/t/ohpi/openhpi.conf -TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/baselib/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs +TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(top_builddir)/openhpid/t/ohpi/uid_map +TESTS_ENVIRONMENT += OPENHPI_CONF=$(top_srcdir)/openhpid/t/ohpi/openhpi.conf +TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/openhpid/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs TESTS = \ ohpi_007 \ Modified: openhpi/trunk/plugins/ipmi/t/Makefile.am =================================================================== --- openhpi/trunk/plugins/ipmi/t/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/plugins/ipmi/t/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -33,12 +33,11 @@ noinst_PROGRAMS = ipmi_thres_test INCLUDES = @OPENHPI_INCLUDES@ -LD_DIRS = -L$(top_builddir)/baselib -L$(top_builddir)/utils - #noinst_PROGRAMS = set_thres ipmi_thres_test_SOURCES = ipmi_thres_test.c -ipmi_thres_test_LDADD = $(LD_DIRS) -luuid -lopenhpiutils -lopenhpi +ipmi_thres_test_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la #set_thres_SOURCES = set_thres.c #set_thres_LDADD = $(top_builddir)/baselib/libopenhpi.la Modified: openhpi/trunk/plugins/simulator/t/Makefile.am =================================================================== --- openhpi/trunk/plugins/simulator/t/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/plugins/simulator/t/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -15,13 +15,13 @@ MAINTAINERCLEANFILES = Makefile.in -TDEPLIB = $(top_builddir)/baselib/libopenhpi.la \ +TDEPLIB = $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/utils/libopenhpiutils.la TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(top_builddir)/plugins/simulator/t/uid_map TESTS_ENVIRONMENT += OPENHPI_CONF=$(top_srcdir)/plugins/simulator/t/openhpi.conf -TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/baselib/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs +TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/openhpid/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs TESTS = sim_sanity_000 \ sim_sanity_001 \ Modified: openhpi/trunk/plugins/snmp_bc/t/Makefile.am =================================================================== --- openhpi/trunk/plugins/snmp_bc/t/Makefile.am 2010-06-14 16:23:07 UTC (rev 7107) +++ openhpi/trunk/plugins/snmp_bc/t/Makefile.am 2010-06-15 21:24:40 UTC (rev 7108) @@ -95,7 +95,7 @@ TESTS_ENVIRONMENT += OPENHPI_SIMTEST_FILE=$(srcdir)/sim_test_file #TESTS_ENVIRONMENT += OPENHPI_ERROR=YES #TESTS_ENVIRONMENT += OPENHPI_DEBUG=YES -TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/baselib/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs:$(top_srcdir)/plugins/snmp/.libs:$(top_srcdir)/plugins/snmp_bc/t/.libs +TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/openhpid/.libs:$(top_srcdir)/ssl/.libs:$(top_srcdir)/utils/.libs:$(top_srcdir)/plugins/snmp/.libs:$(top_srcdir)/plugins/snmp_bc/t/.libs TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(shell pwd)/uid_map TESTS_ENVIRONMENT += OPENHPI_PATH=$(shell pwd) @@ -180,425 +180,425 @@ # Unit test using normal IF calls and simulation library tsim_file_SOURCES = tsim_file.c tsim_file_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library tevent_SOURCES = tevent.c tevent_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library tcontrol_parms_SOURCES = tcontrol_parms.c tcontrol_parms_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library tset_resource_tag_SOURCES = tset_resource_tag.c tset_resource_tag_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library tset_resource_sev_SOURCES = tset_resource_sev.c tset_resource_sev_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library tsnmp_bc_getset_SOURCES = tsnmp_bc_getset.c tsnmp_bc_getset_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget001_SOURCES = tsensorget001.c tsensorget001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget002_SOURCES = tsensorget002.c tsensorget002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget003_SOURCES = tsensorget003.c tsensorget003_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget004_SOURCES = tsensorget004.c tsensorget004_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget005_SOURCES = tsensorget005.c tsensorget005_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget010_SOURCES = tsensorget010.c tsensorget010_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget013_SOURCES = tsensorget013.c tsensorget013_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget016_SOURCES = tsensorget016.c tsensorget016_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget031_SOURCES = tsensorget031.c tsensorget031_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget033_SOURCES = tsensorget033.c tsensorget033_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget034_SOURCES = tsensorget034.c tsensorget034_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget035_SOURCES = tsensorget035.c tsensorget035_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget036_SOURCES = tsensorget036.c tsensorget036_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget040_SOURCES = tsensorget040.c tsensorget040_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorget041_SOURCES = tsensorget041.c tsensorget041_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset001_SOURCES = tsensorset001.c tsensorset001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset002_SOURCES = tsensorset002.c tsensorset002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset003_SOURCES = tsensorset003.c tsensorset003_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset004_SOURCES = tsensorset004.c tsensorset004_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset005_SOURCES = tsensorset005.c tsensorset005_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset006_SOURCES = tsensorset006.c tsensorset006_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset007_SOURCES = tsensorset007.c tsensorset007_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset008_SOURCES = tsensorset008.c tsensorset008_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset009_SOURCES = tsensorset009.c tsensorset009_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset010_SOURCES = tsensorset010.c tsensorset010_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset011_SOURCES = tsensorset011.c tsensorset011_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset012_SOURCES = tsensorset012.c tsensorset012_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset013_SOURCES = tsensorset013.c tsensorset013_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset015_SOURCES = tsensorset015.c tsensorset015_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset017_SOURCES = tsensorset017.c tsensorset017_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset018_SOURCES = tsensorset018.c tsensorset018_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset019_SOURCES = tsensorset019.c tsensorset019_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset020_SOURCES = tsensorset020.c tsensorset020_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset021_SOURCES = tsensorset021.c tsensorset021_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset022_SOURCES = tsensorset022.c tsensorset022_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset023_SOURCES = tsensorset023.c tsensorset023_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsensorset024_SOURCES = tsensorset024.c tsensorset024_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel001_SOURCES = tel001.c tel001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel002_SOURCES = tel002.c tel002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel003_SOURCES = tel003.c tel003_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel004_SOURCES = tel004.c tel004_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel005_SOURCES = tel005.c tel005_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel006_SOURCES = tel006.c tel006_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tel007_SOURCES = tel007.c tel007_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv001_SOURCES = tinv001.c tinv001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv002_SOURCES = tinv002.c tinv002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv003_SOURCES = tinv003.c tinv003_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv004_SOURCES = tinv004.c tinv004_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv005_SOURCES = tinv005.c tinv005_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv006_SOURCES = tinv006.c tinv006_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tinv007_SOURCES = tinv007.c tinv007_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # thotswap001_SOURCES = thotswap001.c thotswap001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # thotswap_mhs001_SOURCES = thotswap-mhs001.c thotswap_mhs001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # thotswap_simple001_SOURCES = thotswap-simple001.c thotswap_simple001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tpower001_SOURCES = tpower001.c tpower001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # treset001_SOURCES = treset001.c treset001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsptime001_SOURCES = tsptime001.c tsptime001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tsptime002_SOURCES = tsptime002.c tsptime002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tdiscover001_SOURCES = tdiscover001.c tdiscover001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # #tdiscover002_SOURCES = tdiscover002.c #tdiscover002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ -# $(top_builddir)/baselib/libopenhpi.la \ +# $(top_builddir)/openhpid/libopenhpidaemon.la \ # $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tcontrol001_SOURCES = tcontrol001.c tcontrol001_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tcontrol002_SOURCES = tcontrol002.c tcontrol002_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # tcontrol003_SOURCES = tcontrol003.c tcontrol003_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la tcontrolfailover_SOURCES = tcontrolfailover.c tcontrolfailover_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ - $(top_builddir)/baselib/libopenhpi.la \ + $(top_builddir)/openhpid/libopenhpidaemon.la \ $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la # Unit test using normal IF calls and simulation library #tsnmp_bc_get_guid_SOURCES = tsnmp_bc_get_guid.c #tsnmp_bc_get_guid_LDADD = $(top_builddir)/utils/libopenhpiutils.la \ -# $(top_builddir)/baselib/libopenhpi.la \ +# $(top_builddir)/openhpid/libopenhpidaemon.la \ # $(top_builddir)/plugins/snmp_bc/t/libsnmp_bc.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |