]>
Commit | Line | Data |
---|---|---|
1 | diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am | |
2 | --- ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am 2012-03-28 08:14:13.000000000 +0200 | |
3 | +++ ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am 2012-06-06 08:26:09.000000000 +0200 | |
4 | @@ -39,7 +39,7 @@ | |
5 | rm -f *.pc | |
6 | ||
7 | ## Subdirectories... | |
8 | -SUBDIRS = common pengine transition cib fencing cluster plugins | |
9 | +SUBDIRS = common pengine cib transition fencing cluster plugins | |
10 | DIST_SUBDIRS = $(SUBDIRS) ais | |
11 | ||
12 | if BUILD_CS_PLUGIN | |
13 | diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am | |
14 | --- ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am 2012-03-28 08:14:13.000000000 +0200 | |
15 | +++ ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am 2012-06-06 08:28:21.000000000 +0200 | |
16 | @@ -31,10 +31,12 @@ | |
17 | ||
18 | libpe_rules_la_LDFLAGS = -version-info 2:0:0 | |
19 | libpe_rules_la_SOURCES = $(rule_files) | |
20 | +libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la | |
21 | ||
22 | libpe_status_la_LDFLAGS = -version-info 3:0:0 | |
23 | libpe_status_la_SOURCES = $(rule_files) $(status_files) | |
24 | -libpe_status_la_LIBADD = -llrm @CURSESLIBS@ | |
25 | +libpe_status_la_LIBADD = -llrm @CURSESLIBS@ \ | |
26 | + $(top_builddir)/lib/common/libcrmcommon.la | |
27 | ||
28 | clean-generic: | |
29 | rm -f *.log *.debug *~ | |
30 | diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am | |
31 | --- ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am 2012-03-28 08:14:13.000000000 +0200 | |
32 | +++ ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am 2012-06-06 08:22:40.000000000 +0200 | |
33 | @@ -29,6 +29,7 @@ | |
34 | ||
35 | libtransitioner_la_LDFLAGS = -version-info 1:0:0 | |
36 | libtransitioner_la_CFLAGS = -I$(top_builddir) | |
37 | +libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la | |
38 | ||
39 | clean-generic: | |
40 | rm -f *~ |