projects / packages / pacemaker.git / blame
| Commit | Line | Data |
|---|---|---|
| cb585696 JK |
1 | diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/Makefile.am pacemaker-Pacemaker-1.1.9/lib/Makefile.am |
| 2 | --- pacemaker-Pacemaker-1.1.9.orig/lib/Makefile.am 2013-03-08 11:48:01.000000000 +0100 | |
| 3 | +++ pacemaker-Pacemaker-1.1.9/lib/Makefile.am 2013-06-21 13:53:10.000000000 +0200 | |
| da3fb05a JK |
4 | @@ -39,7 +39,7 @@ |
| 5 | rm -f *.pc | |
| 6 | ||
| 7 | ## Subdirectories... | |
| ed3071d2 JK |
8 | -SUBDIRS = gnu common pengine transition cib fencing services lrmd cluster |
| 9 | +SUBDIRS = gnu common pengine cib transition fencing services lrmd cluster | |
| da3fb05a JK |
10 | DIST_SUBDIRS = $(SUBDIRS) ais |
| 11 | ||
| 12 | if BUILD_CS_PLUGIN | |
| cb585696 JK |
13 | diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/pengine/Makefile.am pacemaker-Pacemaker-1.1.9/lib/pengine/Makefile.am |
| 14 | --- pacemaker-Pacemaker-1.1.9.orig/lib/pengine/Makefile.am 2013-03-08 11:48:01.000000000 +0100 | |
| 15 | +++ pacemaker-Pacemaker-1.1.9/lib/pengine/Makefile.am 2013-06-21 13:54:07.000000000 +0200 | |
| ed3071d2 | 16 | @@ -28,10 +28,12 @@ |
| 07ce3f2c | 17 | |
| cb585696 | 18 | libpe_rules_la_LDFLAGS = -version-info 2:2:0 |
| ed3071d2 | 19 | libpe_rules_la_SOURCES = rules.c common.c |
| cb585696 | 20 | +libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la |
| 07ce3f2c | 21 | |
| cb585696 | 22 | libpe_status_la_LDFLAGS = -version-info 5:0:1 |
| ed3071d2 JK |
23 | libpe_status_la_SOURCES = status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c |
| 24 | -libpe_status_la_LIBADD = @CURSESLIBS@ | |
| 25 | +libpe_status_la_LIBADD = @CURSESLIBS@ \ | |
| 26 | + $(top_builddir)/lib/common/libcrmcommon.la | |
| 07ce3f2c MM |
27 | |
| 28 | clean-generic: | |
| 29 | rm -f *.log *.debug *~ | |
| cb585696 JK |
30 | Only in pacemaker-Pacemaker-1.1.9/lib/pengine: Makefile.am.orig |
| 31 | Only in pacemaker-Pacemaker-1.1.9/lib/pengine: Makefile.am.rej | |
| 32 | diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/services/Makefile.am pacemaker-Pacemaker-1.1.9/lib/services/Makefile.am | |
| 33 | --- pacemaker-Pacemaker-1.1.9.orig/lib/services/Makefile.am 2013-03-08 11:48:01.000000000 +0100 | |
| 34 | +++ pacemaker-Pacemaker-1.1.9/lib/services/Makefile.am 2013-06-21 13:53:10.000000000 +0200 | |
| ed3071d2 JK |
35 | @@ -26,7 +26,8 @@ |
| 36 | libcrmservice_la_SOURCES = services.c services_linux.c | |
| 37 | libcrmservice_la_LDFLAGS = -version-info 1:0:0 | |
| 38 | libcrmservice_la_CFLAGS = $(GIO_CFLAGS) | |
| 39 | -libcrmservice_la_LIBADD = $(GIO_LIBS) | |
| 40 | +libcrmservice_la_LIBADD = $(GIO_LIBS) \ | |
| 41 | + $(top_builddir)/lib/common/libcrmcommon.la | |
| 42 | ||
| 43 | if BUILD_UPSTART | |
| 44 | libcrmservice_la_SOURCES += upstart.c | |
| cb585696 JK |
45 | diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/transition/Makefile.am pacemaker-Pacemaker-1.1.9/lib/transition/Makefile.am |
| 46 | --- pacemaker-Pacemaker-1.1.9.orig/lib/transition/Makefile.am 2013-03-08 11:48:01.000000000 +0100 | |
| 47 | +++ pacemaker-Pacemaker-1.1.9/lib/transition/Makefile.am 2013-06-21 13:53:10.000000000 +0200 | |
| 07ce3f2c MM |
48 | @@ -29,6 +29,7 @@ |
| 49 | ||
| ed3071d2 | 50 | libtransitioner_la_LDFLAGS = -version-info 2:0:0 |
| 07ce3f2c MM |
51 | libtransitioner_la_CFLAGS = -I$(top_builddir) |
| 52 | +libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la | |
| 53 | ||
| 54 | clean-generic: | |
| 55 | rm -f *~ |