--- heartbeat-2.0.8.orig/membership/ccm/Makefile.am	2007-01-12 03:57:08.000000000 +0100
+++ heartbeat-2.0.8/membership/ccm/Makefile.am	2009-11-18 18:06:29.402999800 +0100
@@ -89,6 +89,7 @@
 
 libccmclient_la_SOURCES	= ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
 libccmclient_la_LDFLAGS	= -version-info 1:0:0
+libccmclient_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la
 
 
 ## library libclm.la
@@ -102,6 +103,7 @@
 ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
 libclm_la_CFLAGS	= -DHA_VARLIBDIR='"@HA_VARLIBDIR@"' -g #-DPOSIX_THREADS
 libclm_la_LDFLAGS	= -version-info 1:0:0
+libclm_la_LIBADD = $(gliblib) ./libccmclient.la
 
 clmtest_SOURCES		= clmtest.c
 clmtest_LDADD		= libclm.la libccmclient.la \
--- heartbeat-2.0.8.orig/lib/crm/common/Makefile.am	2007-01-12 03:57:08.000000000 +0100
+++ heartbeat-2.0.8/lib/crm/common/Makefile.am	2009-11-18 18:07:11.829252027 +0100
@@ -41,6 +41,7 @@
 libcrmcommon_la_SOURCES	= ipc.c msg.c utils.c xml.c ctrl.c \
 			iso8601.c iso8601_fields.c
 libcrmcommon_la_LDFLAGS	= -version-info 1:1:0
+libcrmcommon_la_LIBADD = $(gliblib) $(top_builddir)/lib/clplumbing/libplumb.la
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
--- heartbeat-2.0.8.orig/crm/pengine/Makefile.am	2007-01-12 03:57:04.000000000 +0100
+++ heartbeat-2.0.8/crm/pengine/Makefile.am	2009-11-18 18:07:44.928999529 +0100
@@ -63,6 +63,9 @@
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c \
 			native.c group.c clone.c master.c graph.c
+libpengine_la_LIBADD = $(top_builddir)/lib/crm/pengine/libpe_rules.la \
+        $(top_builddir)/lib/crm/pengine/libpe_status.la
+
 
 pengine_SOURCES	= main.c
 pengine_CFLAGS	= -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
--- heartbeat-2.0.8.orig/lib/crm/pengine/Makefile.am	2007-01-12 03:57:08.000000000 +0100
+++ heartbeat-2.0.8/lib/crm/pengine/Makefile.am	2009-11-18 18:08:21.715999508 +0100
@@ -60,6 +60,8 @@
 
 libpe_status_la_LDFLAGS	= -version-info 1:0:0
 libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
+libpe_status_la_LIBADD = -lncurses \
+	$(top_builddir)/lib/crm/cib/libcib.la
 
 clean-generic:
 	rm -f *.log *.debug *~
--- heartbeat-2.0.8.orig/lib/crm/Makefile.am	2007-01-12 03:57:08.000000000 +0100
+++ heartbeat-2.0.8/lib/crm/Makefile.am	2009-11-18 18:08:42.514251905 +0100
@@ -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