--- crm/pengine/Makefile.am.link 2010-04-07 11:55:42.000000000 +0200 +++ crm/pengine/Makefile.am 2010-04-07 11:58:21.000000000 +0200 @@ -61,6 +61,8 @@ #utils.h pengine.h libpengine_la_LDFLAGS = -version-info 3:0:0 +libpengine_la_LIBADD = $(top_builddir)/lib/crm/common/libcrmcommon.la \ + $(top_builddir)/lib/crm/pengine/libpe_status.la # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \ native.c group.c clone.c master.c graph.c --- lib/apphb/Makefile.am.link 2010-04-07 11:33:47.000000000 +0200 +++ lib/apphb/Makefile.am 2010-04-07 11:34:19.000000000 +0200 @@ -39,3 +39,4 @@ endif libapphb_la_LDFLAGS = -version-info 0:0:0 +libapphb_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la --- lib/clplumbing/Makefile.am.link 2010-04-07 11:27:11.000000000 +0200 +++ lib/clplumbing/Makefile.am 2010-04-07 11:29:36.000000000 +0200 @@ -72,6 +72,7 @@ libplumbgpl_la_SOURCES = setproctitle.c libplumbgpl_la_LIBADD = $(top_builddir)/replace/libreplace.la \ + libplumb.la \ $(top_builddir)/lib/pils/libpils.la libplumbgpl_la_LDFLAGS = -version-info 1:0:0 --- lib/crm/cib/Makefile.am.link 2010-04-07 11:46:31.000000000 +0200 +++ lib/crm/cib/Makefile.am 2010-04-07 11:47:10.000000000 +0200 @@ -46,6 +46,8 @@ cib_version.c libcib_la_LDFLAGS = -version-info 1:1:0 +libcib_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la \ + $(top_builddir)/lib/crm/common/libcrmcommon.la libcib_la_CFLAGS = -I$(top_builddir) clean-generic: --- lib/crm/common/Makefile.am.link 2010-04-07 11:37:37.000000000 +0200 +++ lib/crm/common/Makefile.am 2010-04-07 11:37:59.000000000 +0200 @@ -40,6 +40,7 @@ libcrmcommon_la_SOURCES = ipc.c msg.c utils.c xml.c ctrl.c \ iso8601.c iso8601_fields.c +libcrmcommon_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la libcrmcommon_la_LDFLAGS = -version-info 1:1:0 clean-generic: --- lib/crm/pengine/Makefile.am.link 2010-04-07 11:38:20.000000000 +0200 +++ lib/crm/pengine/Makefile.am 2010-04-07 11:48:00.000000000 +0200 @@ -48,9 +48,14 @@ status_files = status.c unpack.c utils.c complex.c native.c group.c clone.c libpe_rules_la_LDFLAGS = -version-info 2:0:0 +libpe_rules_la_LIBADD = $(top_builddir)/lib/crm/common/libcrmcommon.la libpe_rules_la_SOURCES = $(rule_files) libpe_status_la_LDFLAGS = -version-info 2:0:0 +libpe_status_la_LIBADD = $(top_builddir)/lib/crm/common/libcrmcommon.la \ + $(top_builddir)/lib/clplumbing/libplumb.la \ + $(top_builddir)/lib/crm/cib/libcib.la \ + $(CURSESLIBS) libpe_status_la_SOURCES = $(rule_files) $(status_files) clean-generic: --- lib/crm/transition/Makefile.am.link 2010-04-07 11:48:17.000000000 +0200 +++ lib/crm/transition/Makefile.am 2010-04-07 11:48:44.000000000 +0200 @@ -35,6 +35,7 @@ libtransitioner_la_SOURCES = unpack.c graph.c utils.c libtransitioner_la_LDFLAGS = -version-info 1:0:0 +libtransitioner_la_LIBADD = $(top_builddir)/lib/crm/common/libcrmcommon.la libtransitioner_la_CFLAGS = -I$(top_builddir) clean-generic: --- lib/hbclient/Makefile.am.link 2010-04-07 11:31:08.000000000 +0200 +++ lib/hbclient/Makefile.am 2010-04-07 11:31:20.000000000 +0200 @@ -45,7 +45,7 @@ libhbclient_la_SOURCES = client_lib.c libhbclient_la_LDFLAGS = -version-info 1:0:0 -libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la +libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la $(top_builddir)/lib/clplumbing/libplumb.la ## binary progs halib_PROGRAMS = api_test --- lib/recoverymgr/Makefile.am.link 2010-04-07 11:35:55.000000000 +0200 +++ lib/recoverymgr/Makefile.am 2010-04-07 11:36:07.000000000 +0200 @@ -34,4 +34,5 @@ recoverymgr.c librecoverymgr_la_LDFLAGS = -version-info 1:0:0 +librecoverymgr_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la --- membership/ccm/Makefile.am.link 2010-04-07 11:51:44.000000000 +0200 +++ membership/ccm/Makefile.am 2010-04-07 11:54:20.000000000 +0200 @@ -84,6 +84,7 @@ libccmclient_la_SOURCES = ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h +libccmclient_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la libccmclient_la_LDFLAGS = -version-info 1:0:0 @@ -98,6 +99,7 @@ ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library libclm_la_CFLAGS = -g #-DPOSIX_THREADS libclm_la_LDFLAGS = -version-info 1:0:0 +libclm_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la libccmclient.la clmtest_SOURCES = clmtest.c clmtest_LDADD = libclm.la libccmclient.la \ --- mgmt/daemon/Makefile.am.link 2010-04-07 12:00:08.000000000 +0200 +++ mgmt/daemon/Makefile.am 2010-04-07 12:02:29.000000000 +0200 @@ -57,6 +57,8 @@ libhbmgmt_la_CFLAGS = $(INCLUDES) libhbmgmt_la_LDFLAGS = $(GNUTLSLIBS) libhbmgmt_la_LIBADD = $(top_builddir)/lib/mgmt/libhbmgmttls.la \ + $(top_builddir)/lib/mgmt/libhbmgmtcommon.la \ + $(top_builddir)/lib/lrm/liblrm.la \ $(top_builddir)/lib/crm/cib/libcib.la \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(top_builddir)/lib/apphb/libapphb.la \ --- lib/crm/Makefile.am.link 2010-04-07 12:14:01.000000000 +0200 +++ lib/crm/Makefile.am 2010-04-07 12:14:15.000000000 +0200 @@ -18,5 +18,5 @@ MAINTAINERCLEANFILES = Makefile.in ## Subdirectories... -SUBDIRS = common pengine cib transition -DIST_SUBDIRS = common pengine cib transition +SUBDIRS = common cib pengine transition +DIST_SUBDIRS = common cib pengine transition --- lib/mgmt/Makefile.am.link 2007-12-21 16:32:27.000000000 +0100 +++ lib/mgmt/Makefile.am 2010-04-07 12:20:43.000000000 +0200 @@ -33,14 +33,14 @@ EXTRA_DIST = pymgmt.i -lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la +lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtcommon.la libhbmgmtclient.la libhbmgmttls_la_SOURCES = mgmt_tls_lib.c libhbmgmttls_la_LIBADD = $(COMMONLIBS) libhbmgmttls_la_LDFLAGS = $(GNUTLSLIBS) libhbmgmttls_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD) libhbmgmtclient_la_SOURCES = mgmt_client_lib.c -libhbmgmtclient_la_LIBADD = $(COMMONLIBS) libhbmgmttls.la $(top_builddir)/replace/libreplace.la +libhbmgmtclient_la_LIBADD = $(COMMONLIBS) libhbmgmttls.la $(top_builddir)/replace/libreplace.la libhbmgmtcommon.la libhbmgmtclient_la_CFLAGS = $(INCLUDES) libhbmgmtcommon_la_SOURCES = mgmt_common_lib.c
