Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-release-src > by-pkgid > 60e6e2afcfa8f217b321328e333275a6 > files > 1

pacemaker-1.1.8-9.mga5.src.rpm

--- ClusterLabs-pacemaker-394e906/configure.ac.0005	2013-01-21 13:33:56.641231846 +0800
+++ ClusterLabs-pacemaker-394e906/configure.ac	2013-01-21 13:33:56.641231846 +0800
@@ -1758,6 +1758,7 @@
 	lib/cluster/Makefile					\
 	lib/cib/Makefile					\
 	lib/pengine/Makefile					\
+	lib/pe_rules/Makefile					\
 	lib/transition/Makefile					\
 	lib/fencing/Makefile					\
 	lib/lrmd/Makefile					\
--- ClusterLabs-pacemaker-394e906/crmd/Makefile.am.0005	2013-01-21 13:34:02.951396725 +0800
+++ ClusterLabs-pacemaker-394e906/crmd/Makefile.am	2013-01-21 13:34:26.302007034 +0800
@@ -43,7 +43,7 @@
 
 crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
 		$(top_builddir)/lib/transition/libtransitioner.la	\
-		$(top_builddir)/lib/pengine/libpe_rules.la		\
+		$(top_builddir)/lib/pe_rules/libpe_rules.la		\
 		$(top_builddir)/lib/cib/libcib.la			\
 		$(top_builddir)/lib/cluster/libcrmcluster.la		\
 		$(top_builddir)/lib/common/libcrmcommon.la		\
--- ClusterLabs-pacemaker-394e906/lib/cib/Makefile.am.0005	2012-09-21 06:19:31.000000000 +0800
+++ ClusterLabs-pacemaker-394e906/lib/cib/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -32,8 +32,10 @@
 libcib_la_SOURCES       += cib_acl.c
 endif
 
-libcib_la_LDFLAGS	= -version-info 2:0:0 $(top_builddir)/lib/common/libcrmcommon.la $(CRYPTOLIB) \
-			$(top_builddir)/lib/pengine/libpe_rules.la
+libcib_la_LDFLAGS	= -version-info 2:0:0
+libcib_la_LIBADD	= $(top_builddir)/lib/pe_rules/libpe_rules.la \
+			$(top_builddir)/lib/common/libcrmcommon.la \
+			$(CRYPTOLIB)
 
 libcib_la_CFLAGS	= -I$(top_srcdir)
 
--- ClusterLabs-pacemaker-394e906/lib/cluster/Makefile.am.0005	2012-09-21 06:19:31.000000000 +0800
+++ ClusterLabs-pacemaker-394e906/lib/cluster/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -28,8 +28,8 @@
 lib_LTLIBRARIES	= libcrmcluster.la 
 
 libcrmcluster_la_SOURCES = cluster.c membership.c
-libcrmcluster_la_LDFLAGS = -version-info 2:0:0 $(CLUSTERLIBS) 
-libcrmcluster_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la
+libcrmcluster_la_LDFLAGS = -version-info 2:0:0
+libcrmcluster_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la $(CLUSTERLIBS)
 libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la 
 
 if BUILD_CS_SUPPORT
--- ClusterLabs-pacemaker-394e906/lib/Makefile.am.0005	2013-01-21 13:33:56.501228189 +0800
+++ ClusterLabs-pacemaker-394e906/lib/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -39,7 +39,7 @@
 	rm -f *.pc
 
 ## Subdirectories...
-SUBDIRS	= gnu common pengine transition cib fencing services lrmd cluster
+SUBDIRS	= gnu common pe_rules cib pengine transition fencing services lrmd cluster
 DIST_SUBDIRS =  $(SUBDIRS) ais
 
 if BUILD_CS_PLUGIN
--- ClusterLabs-pacemaker-394e906/lib/pengine/Makefile.am.0005	2012-09-21 06:19:31.000000000 +0800
+++ ClusterLabs-pacemaker-394e906/lib/pengine/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -21,17 +21,14 @@
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 ## libraries
-lib_LTLIBRARIES	= libpe_rules.la libpe_status.la
+lib_LTLIBRARIES	= libpe_status.la
 
 ## SOURCES
 noinst_HEADERS	= unpack.h variant.h
 
-libpe_rules_la_LDFLAGS	= -version-info 2:1:0
-libpe_rules_la_SOURCES	= rules.c common.c
-
 libpe_status_la_LDFLAGS	= -version-info 4:0:0
 libpe_status_la_SOURCES	=  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
-libpe_status_la_LIBADD	=  @CURSESLIBS@
+libpe_status_la_LIBADD	=  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/cib/libcib.la
 
 clean-generic:
 	rm -f *.log *.debug *~
--- ClusterLabs-pacemaker-394e906/lib/pe_rules/Makefile.am.0005	2013-01-21 13:33:56.641231846 +0800
+++ ClusterLabs-pacemaker-394e906/lib/pe_rules/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES    = Makefile.in
+
+INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
+		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
+
+## libraries
+lib_LTLIBRARIES	= libpe_rules.la
+
+libpe_rules_la_LDFLAGS	= -version-info 2:1:0
+libpe_rules_la_SOURCES	= $(top_srcdir)/lib/pengine/rules.c $(top_srcdir)/lib/pengine/common.c
+libpe_rules_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
+
+clean-generic:
+	rm -f *.log *.debug *~
+
+install-exec-local:
+
+uninstall-local:
--- ClusterLabs-pacemaker-394e906/lib/services/Makefile.am.0005	2012-09-21 06:19:31.000000000 +0800
+++ ClusterLabs-pacemaker-394e906/lib/services/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -26,7 +26,7 @@
 libcrmservice_la_SOURCES = services.c services_linux.c
 libcrmservice_la_LDFLAGS = -version-info 1:0:0
 libcrmservice_la_CFLAGS  = $(GIO_CFLAGS)
-libcrmservice_la_LIBADD   = $(GIO_LIBS)
+libcrmservice_la_LIBADD   = $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la
 
 if BUILD_UPSTART
 libcrmservice_la_SOURCES += upstart.c
--- ClusterLabs-pacemaker-394e906/lib/transition/Makefile.am.0005	2012-09-21 06:19:31.000000000 +0800
+++ ClusterLabs-pacemaker-394e906/lib/transition/Makefile.am	2013-01-21 13:33:56.641231846 +0800
@@ -29,6 +29,7 @@
 
 libtransitioner_la_LDFLAGS	= -version-info 2:0:0
 libtransitioner_la_CFLAGS	= -I$(top_builddir)
+libtransitioner_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
 
 clean-generic:
 	rm -f *~
--- ClusterLabs-pacemaker-394e906/tools/Makefile.am.0005	2013-01-21 13:34:09.451566671 +0800
+++ ClusterLabs-pacemaker-394e906/tools/Makefile.am	2013-01-21 13:34:48.052575441 +0800
@@ -111,7 +111,7 @@
 crm_attribute_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(COMMONLIBS) 
 
 crm_resource_SOURCES	= crm_resource.c
-crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
+crm_resource_LDADD	= $(top_builddir)/lib/pe_rules/libpe_rules.la  \
 			$(top_builddir)/lib/lrmd/liblrmd.la \
 			$(top_builddir)/lib/services/libcrmservice.la \
 			$(top_builddir)/lib/pengine/libpe_status.la \
@@ -131,7 +131,7 @@
 attrd_updater_LDADD	= $(COMMONLIBS)
 
 crm_ticket_SOURCES	= crm_ticket.c
-crm_ticket_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
+crm_ticket_LDADD	= $(top_builddir)/lib/pe_rules/libpe_rules.la  \
 			$(top_builddir)/lib/pengine/libpe_status.la \
 			$(top_builddir)/pengine/libpengine.la \
 			$(COMMONLIBS)