projects / packages / pacemaker.git / blame
| Commit | Line | Data |
|---|---|---|
| 07ce3f2c MM |
1 | diff -ru Pacemaker-1-0-Pacemaker-1.0.9.1.orig/pengine/Makefile.am Pacemaker-1-0-Pacemaker-1.0.9.1/pengine/Makefile.am |
| 2 | --- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/pengine/Makefile.am 2010-06-23 20:08:40.000000000 +0200 | |
| 3 | +++ Pacemaker-1-0-Pacemaker-1.0.9.1/pengine/Makefile.am 2011-04-28 08:53:55.536677098 +0200 | |
| 4 | @@ -58,6 +58,7 @@ | |
| 5 | # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version | |
| 6 | libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \ | |
| 7 | native.c group.c clone.c master.c graph.c | |
| 8 | +libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la | |
| 9 | ||
| 10 | pengine_SOURCES = main.c | |
| 11 | pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la | |
| 12 | diff -ru Pacemaker-1-0-Pacemaker-1.0.9.1.orig/tools/Makefile.am Pacemaker-1-0-Pacemaker-1.0.9.1/tools/Makefile.am | |
| 13 | --- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/tools/Makefile.am 2010-06-23 20:08:40.000000000 +0200 | |
| 14 | +++ Pacemaker-1-0-Pacemaker-1.0.9.1/tools/Makefile.am 2011-04-28 09:38:06.620010890 +0200 | |
| 15 | @@ -85,7 +85,7 @@ | |
| 16 | crm_diff_LDADD = $(COMMONLIBS) | |
| 17 | ||
| 18 | crm_mon_SOURCES = crm_mon.c | |
| 19 | -crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \ | |
| 20 | +crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm -ltinfo \ | |
| 21 | $(top_builddir)/lib/pengine/libpe_status.la | |
| 22 | ||
| 23 | # Arguments could be made that this should live in crm/pengine | |
| 24 | --- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/pengine/Makefile.am 2010-06-23 20:08:40.000000000 +0200 | |
| 25 | +++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/pengine/Makefile.am 2011-04-28 10:04:50.773343305 +0200 | |
| 26 | @@ -31,10 +31,13 @@ | |
| 27 | ||
| 28 | libpe_rules_la_LDFLAGS = -version-info 2:0:0 | |
| 29 | libpe_rules_la_SOURCES = $(rule_files) | |
| 30 | +libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la | |
| 31 | ||
| 32 | libpe_status_la_LDFLAGS = -version-info 2:0:0 | |
| 33 | libpe_status_la_SOURCES = $(rule_files) $(status_files) | |
| 34 | -libpe_status_la_LIBADD = -llrm | |
| 35 | +libpe_status_la_LIBADD = -llrm $(CURSESLIBS) \ | |
| 36 | + $(top_builddir)/lib/common/libcrmcommon.la \ | |
| 37 | + $(top_builddir)/lib/cib/libcib.la | |
| 38 | ||
| 39 | clean-generic: | |
| 40 | rm -f *.log *.debug *~ | |
| 41 | --- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/transition/Makefile.am 2010-06-23 20:08:40.000000000 +0200 | |
| 42 | +++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/transition/Makefile.am 2011-04-28 10:06:49.623343760 +0200 | |
| 43 | @@ -29,6 +29,7 @@ | |
| 44 | ||
| 45 | libtransitioner_la_LDFLAGS = -version-info 1:0:0 | |
| 46 | libtransitioner_la_CFLAGS = -I$(top_builddir) | |
| 47 | +libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la | |
| 48 | ||
| 49 | clean-generic: | |
| 50 | rm -f *~ | |
| 51 | --- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/Makefile.am 2010-06-23 20:08:40.000000000 +0200 | |
| 52 | +++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/Makefile.am 2011-04-28 10:09:28.876677338 +0200 | |
| 53 | @@ -18,7 +18,7 @@ | |
| 54 | MAINTAINERCLEANFILES = Makefile.in | |
| 55 | ||
| 56 | ## Subdirectories... | |
| 57 | -SUBDIRS = common pengine transition cib fencing plugins | |
| 58 | +SUBDIRS = common cib pengine transition fencing plugins | |
| 59 | DIST_SUBDIRS = $(SUBDIRS) ais | |
| 60 | ||
| 61 | if BUILD_AIS_SUPPORT |