Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 202893 | Differences between
and this patch

Collapse All | Expand All

(-)heartbeat-2.1.4.orig/lib/crm/Makefile.am (-2 / +2 lines)
Lines 18-22 Link Here
18
MAINTAINERCLEANFILES    = Makefile.in
18
MAINTAINERCLEANFILES    = Makefile.in
19
19
20
## Subdirectories...
20
## Subdirectories...
21
SUBDIRS		= common pengine cib transition
21
SUBDIRS		= common cib pengine transition
22
DIST_SUBDIRS	= common pengine cib transition
22
DIST_SUBDIRS	= common cib pengine transition
(-)heartbeat-2.1.4.orig/lib/crm/pengine/Makefile.am (+2 lines)
Lines 52-57 Link Here
52
52
53
libpe_status_la_LDFLAGS	= -version-info 2:0:0
53
libpe_status_la_LDFLAGS	= -version-info 2:0:0
54
libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
54
libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
55
libpe_status_la_LIBADD = -lncurses \
56
       $(top_builddir)/lib/crm/cib/libcib.la
55
57
56
clean-generic:
58
clean-generic:
57
	rm -f *.log *.debug *~
59
	rm -f *.log *.debug *~
(-)heartbeat-2.1.4.orig/crm/pengine/Makefile.am (+3 lines)
Lines 64-69 Link Here
64
# -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
64
# -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
65
libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
65
libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
66
			native.c group.c clone.c master.c graph.c
66
			native.c group.c clone.c master.c graph.c
67
libpengine_la_LIBADD = $(top_builddir)/lib/crm/pengine/libpe_rules.la \
68
        $(top_builddir)/lib/crm/pengine/libpe_status.la
69
67
70
68
pengine_SOURCES	= main.c
71
pengine_SOURCES	= main.c
69
pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/crm/cib/libcib.la
72
pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/crm/cib/libcib.la
(-)heartbeat-2.1.4.orig/lib/crm/common/Makefile.am (-1 / +1 lines)
Lines 41-47 Link Here
41
libcrmcommon_la_SOURCES	= ipc.c msg.c utils.c xml.c ctrl.c \
41
libcrmcommon_la_SOURCES	= ipc.c msg.c utils.c xml.c ctrl.c \
42
			iso8601.c iso8601_fields.c
42
			iso8601.c iso8601_fields.c
43
libcrmcommon_la_LDFLAGS	= -version-info 1:1:0
43
libcrmcommon_la_LDFLAGS	= -version-info 1:1:0
44
44
libcrmcommon_la_LIBADD  = $(gliblib) $(top_builddir)/lib/clplumbing/libplumb.la
45
clean-generic:
45
clean-generic:
46
	rm -f *.log *.debug *.xml *~
46
	rm -f *.log *.debug *.xml *~
47
47
(-)heartbeat-2.1.4.orig/membership/ccm/Makefile.am (-2 / +2 lines)
Lines 85-91 Link Here
85
85
86
libccmclient_la_SOURCES	= ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
86
libccmclient_la_SOURCES	= ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
87
libccmclient_la_LDFLAGS	= -version-info 1:0:0
87
libccmclient_la_LDFLAGS	= -version-info 1:0:0
88
88
libccmclient_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la
89
89
90
## library libclm.la
90
## library libclm.la
91
libclmdir		= $(libdir)/@HB_PKG@
91
libclmdir		= $(libdir)/@HB_PKG@
Lines 98-104 Link Here
98
## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
98
## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
99
libclm_la_CFLAGS	= -g #-DPOSIX_THREADS
99
libclm_la_CFLAGS	= -g #-DPOSIX_THREADS
100
libclm_la_LDFLAGS	= -version-info 1:0:0
100
libclm_la_LDFLAGS	= -version-info 1:0:0
101
101
libclm_la_LIBADD = $(gliblib) ./libccmclient.la
102
clmtest_SOURCES		= clmtest.c
102
clmtest_SOURCES		= clmtest.c
103
clmtest_LDADD		= libclm.la libccmclient.la \
103
clmtest_LDADD		= libclm.la libccmclient.la \
104
			  $(top_builddir)/lib/clplumbing/libplumb.la \
104
			  $(top_builddir)/lib/clplumbing/libplumb.la \

Return to bug 202893