Merge trunk revision 2402 (theirs conflict):

r2402 | fabbione | 2009-09-07 00:24:15 -0700 (Mon, 07 Sep 2009) | 2 lines

Fix corosync-tools linking



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2450 fd59a12c-fef9-0310-b244-a6a79926bd2f

tools/Makefile.am

@@ -36,9 +36,14 @@ sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
 			  corosync-keygen corosync-objctl \
 			  corosync-pload
 
-corosync_pload_LDADD	= ../lib/libpload.a ../lib/libcoroipcc.a
-corosync_objctl_LDADD	= ../lib/libconfdb.a ../lcr/liblcr.a ../lib/libcoroipcc.a
-corosync_cfgtool_LDADD	= ../lib/libcfg.a ../lib/libcoroipcc.a
+corosync_pload_LDADD	= -lpload -lcoroipcc
+corosync_pload_LDFLAGS	= -L../lib
+corosync_objctl_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc
+corosync_objctl_LDFLAGS	= -L../lib
+corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
+corosync_cfgtool_LDFLAGS= -L../lib
+corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
+corosync_cpgtool_LDFLAGS= -L../lib
 
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c