pacemaker-liborder.patch

   1 --- Pacemaker-1-0-Pacemaker-1.0.3/pengine/Makefile.am~  2009-04-07 14:18:12.000000000 +0200
   2 +++ Pacemaker-1-0-Pacemaker-1.0.3/pengine/Makefile.am   2009-05-11 14:43:46.000000000 +0200
   3 @@ -50,9 +50,10 @@
   4  #              $(top_builddir)/lib/hbclient/libhbclient.la
   5
   6  ptest_SOURCES  = ptest.c
   7 -ptest_LDADD    = $(COMMONLIBS)                                         \
   8 -               $(top_builddir)/lib/cib/libcib.la                       \
   9 -               $(top_builddir)/lib/transition/libtransitioner.la
  10 +ptest_LDADD    = $(top_builddir)/pengine/libpengine.la           \
  11 +               $(top_builddir)/lib/cib/libcib.la                 \
  12 +               $(top_builddir)/lib/transition/libtransitioner.la \
  13 +               $(COMMONLIBS)
  14
  15  clean-generic:
  16         rm -f *.log *.debug *~ .gres.* testcases/.gres.*
  17 --- Pacemaker-1-0-Pacemaker-1.0.3/tools/Makefile.am.orig        2009-04-07 14:18:12.000000000 +0200
  18 +++ Pacemaker-1-0-Pacemaker-1.0.3/tools/Makefile.am     2009-05-11 15:01:31.000000000 +0200
  19 @@ -24,7 +24,7 @@
  20  COMMONLIBS     =                                                       \
  21                 $(top_builddir)/lib/common/libcrmcommon.la              \
  22                 $(top_builddir)/lib/cib/libcib.la                       \
  23 -               -lplumb $(CURSESLIBS) $(CLUSTERLIBS)
  24 +               -lplumb $(CLUSTERLIBS) $(CURSESLIBS)
  25
  26  headerdir               = $(pkgincludedir)/crm
  27  header_HEADERS         = attrd.h
  28 @@ -52,8 +52,8 @@
  29  noinst_HEADERS         =
  30
  31  crmadmin_SOURCES       = crmadmin.c
  32 -crmadmin_LDADD         = $(COMMONLIBS) $(CLUSTERLIBS) \
  33 -                       $(top_builddir)/lib/pengine/libpe_status.la
  34 +crmadmin_LDADD         = $(top_builddir)/lib/pengine/libpe_status.la \
  35 +                       $(CLUSTERLIBS) $(COMMONLIBS)
  36
  37  crm_uuid_SOURCES       = crm_uuid.c
  38  crm_uuid_LDADD         = $(top_builddir)/lib/common/libcrmcluster.la
  39 @@ -65,21 +65,21 @@
  40  crm_shadow_LDADD       = $(COMMONLIBS)
  41
  42  crm_node_SOURCES       = ccm_epoche.c
  43 -crm_node_LDADD         = $(COMMONLIBS) $(CLUSTERLIBS) \
  44 -                       $(top_builddir)/lib/common/libcrmcluster.la
  45 +crm_node_LDADD         = $(top_builddir)/lib/common/libcrmcluster.la \
  46 +                       $(CLUSTERLIBS) $(COMMONLIBS)
  47
  48  crm_diff_SOURCES       = xml_diff.c
  49  crm_diff_LDADD         = $(COMMONLIBS)
  50
  51  crm_mon_SOURCES                = crm_mon.c
  52 -crm_mon_LDADD          = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
  53 -                       $(top_builddir)/lib/pengine/libpe_status.la
  54 +crm_mon_LDADD          = $(top_builddir)/lib/pengine/libpe_status.la \
  55 +                       -llrm $(SNMPLIBS) $(ESMTPLIBS) $(COMMONLIBS)
  56
  57  # Arguments could be made that this should live in crm/pengine
  58  crm_verify_SOURCES     = crm_verify.c
  59 -crm_verify_LDADD       = $(COMMONLIBS) \
  60 +crm_verify_LDADD       = \
  61                         $(top_builddir)/lib/pengine/libpe_status.la \
  62 -                       $(top_builddir)/pengine/libpengine.la
  63 +                       $(top_builddir)/pengine/libpengine.la $(COMMONLIBS)
  64
  65  crm_master_SOURCES     = crm_attribute.c
  66  crm_master_LDADD       = $(COMMONLIBS)
  67 @@ -94,9 +94,10 @@
  68  crm_failcount_LDADD    = $(COMMONLIBS)
  69
  70  crm_resource_SOURCES   = crm_resource.c
  71 -crm_resource_LDADD     = $(COMMONLIBS) \
  72 +crm_resource_LDADD     = \
  73                         $(top_builddir)/lib/pengine/libpe_rules.la \
  74 -                       $(top_builddir)/lib/pengine/libpe_status.la
  75 +                       $(top_builddir)/lib/pengine/libpe_status.la \
  76 +                       $(COMMONLIBS)
  77
  78  iso8601_SOURCES                = test.iso8601.c
  79  iso8601_LDADD          = $(COMMONLIBS)
  80 @@ -104,7 +105,7 @@
  81  # A little trick. Now ccdv can be auto-built but not auto-cleaned.
  82  attrd_DEPENDENCIES     = ccdv
  83  attrd_SOURCES          = attrd.c
  84 -attrd_LDADD            = $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
  85 +attrd_LDADD            = $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
  86
  87  pingd_SOURCES          = pingd.c
  88  pingd_LDADD            = $(COMMONLIBS)