Attachment #196219 for bug #217644




	else \
		echo '-L/usr/lib/openais -L/usr/lib'; \
	fi)
LIBS += -lcpg -lSaCkpt -lext2fs

all: ${TARGET}

clogd: ${SOURCES}
	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^

no_clogd_kernel_headers:
	echo "Unable to find clogd kernel headers"

Lines 101-107 INSTALL_TARGETS = \ Link Here

(-)LVM2.2.02.45.old/daemons/clvmd/Makefile.in (-1 / +1 lines)
101	install_clvmd	101	install_clvmd
102		102
103	clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a	103	clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
104	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \	104	$(CC) -o clvmd $(CFLAGS) $(LDFLAGS) $(OBJECTS) \
105	$(LVMLIBS) $(LMLIBS) $(LIBS)	105	$(LVMLIBS) $(LMLIBS) $(LIBS)
106		106
107	.PHONY: install_clvmd	107	.PHONY: install_clvmd




all: dmeventd
device-mapper: dmeventd

LIBS += -ldl -ldevmapper -lpthread
CLDFLAGS += -ldl -ldevmapper -lpthread

dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
	-ldevmapper-event $(LIBS) -rdynamic

.PHONY: install_dynamic install_static install_include \
	install_pkgconfig install_dmeventd

Lines 17-23 top_srcdir = @top_srcdir@ Link Here

(-)LVM2.2.02.45.old/daemons/dmeventd/plugins/mirror/Makefile.in (-1 / +2 lines)
17	VPATH = @srcdir@	17	VPATH = @srcdir@
18		18
19	INCLUDES += -I${top_srcdir}/tools	19	INCLUDES += -I${top_srcdir}/tools
20	CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@	20	CLDFLAGS += -L${top_srcdir}/tools
		21	LIBS += -ldevmapper @LVM2CMD_LIB@
21		22
22	SOURCES = dmeventd_mirror.c	23	SOURCES = dmeventd_mirror.c
23		24

Lines 17-23 top_srcdir = @top_srcdir@ Link Here

(-)LVM2.2.02.45.old/daemons/dmeventd/plugins/snapshot/Makefile.in (-1 / +2 lines)
17	VPATH = @srcdir@	17	VPATH = @srcdir@
18		18
19	INCLUDES += -I${top_srcdir}/tools	19	INCLUDES += -I${top_srcdir}/tools
20	CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@	20	CLDFLAGS += -L${top_srcdir}/tools
		21	LIBS += -ldevmapper @LVM2CMD_LIB@
21		22
22	SOURCES = dmeventd_snapshot.c	23	SOURCES = dmeventd_snapshot.c
23		24

Lines 137-143 ifeq ("@HAVE_LIBDL@", "yes") Link Here

(-)LVM2.2.02.45.old/lib/Makefile.in (-1 / +1 lines)
137	endif	137	endif
138		138
139	ifeq ("@DMEVENTD@", "yes")	139	ifeq ("@DMEVENTD@", "yes")
140	CLDFLAGS += -ldevmapper-event	140	LIBS += -ldevmapper-event
141	endif	141	endif
142		142
143	LIB_STATIC = liblvm.a	143	LIB_STATIC = liblvm.a




LN_S = @LN_S@
SED = @SED@

LIBS += @LIBS@ $(LVMLIBS) $(LMLIBS)
DEFS += @DEFS@
CFLAGS += @CFLAGS@
CLDFLAGS += @CLDFLAGS@

ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
endif

ifeq ("@LIB_SUFFIX@","dylib")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
endif

%.so: %.a
	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) -o $@ \
	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)

$(LIB_STATIC): $(OBJECTS)
	$(RM) $@

Lines 35-39 LDFLAGS += -L$(top_srcdir)/api/lib Link Here

(-)LVM2.2.02.45.old/test/api/Makefile.in (-1 / +1 lines)
35	include $(top_srcdir)/make.tmpl	35	include $(top_srcdir)/make.tmpl
36		36
37	test: $(OBJECTS) $(top_srcdir)/lib/liblvm.a $(top_srcdir)/libdm/libdevmapper.so	37	test: $(OBJECTS) $(top_srcdir)/lib/liblvm.a $(top_srcdir)/libdm/libdevmapper.so
38	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)	38	$(CC) $(CFLAGS) $(LDFLAGS) -o test $(OBJECTS) $(LVMLIBS) $(LIBS)
39		39




device-mapper: dmsetup

dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_srcdir)/libdm -L$(DESTDIR)/lib \
		-o $@ dmsetup.o -ldevmapper $(LIBS)

dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -L$(DESTDIR)/lib \
		-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
	      $(LIB_PTHREAD)

all: device-mapper

lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
		$(LVMLIBS) $(LIBS) -rdynamic

LIB_PTHREAD = @LIB_PTHREAD@
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a  $(interfacedir)/libdevmapper.a
	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ $(OBJECTS) lvm-static.o \
		$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic

liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
	cat $(top_srcdir)/lib/liblvm.a > $@

Return to bug 217644

Lines 45-56 LDFLAGS += $(shell if [ -e /usr/lib64/op Link Here

(-)LVM2.2.02.45.old/daemons/clogd/Makefile (-2 / +2 lines)
45	else \	45	else \
46	echo '-L/usr/lib/openais -L/usr/lib'; \	46	echo '-L/usr/lib/openais -L/usr/lib'; \
47	fi)	47	fi)
48	LDFLAGS += -lcpg -lSaCkpt -lext2fs	48	LIBS += -lcpg -lSaCkpt -lext2fs
49		49
50	all: ${TARGET}	50	all: ${TARGET}
51		51
52	clogd: ${SOURCES}	52	clogd: ${SOURCES}
53	${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS}	53	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^
54		54
55	no_clogd_kernel_headers:	55	no_clogd_kernel_headers:
56	echo "Unable to find clogd kernel headers"	56	echo "Unable to find clogd kernel headers"

Lines 28-34 GENHTML = @GENHTML@ Link Here

(-)LVM2.2.02.45.old/make.tmpl.in (-5 / +5 lines)
28	LN_S = @LN_S@	28	LN_S = @LN_S@
29	SED = @SED@	29	SED = @SED@
30		30
31	LIBS = @LIBS@	31	LIBS += @LIBS@ $(LVMLIBS) $(LMLIBS)
32	DEFS += @DEFS@	32	DEFS += @DEFS@
33	CFLAGS += @CFLAGS@	33	CFLAGS += @CFLAGS@
34	CLDFLAGS += @CLDFLAGS@	34	CLDFLAGS += @CLDFLAGS@
Lines 202-220 $(TARGETS): $(OBJECTS) Link Here
202	ifeq ("@LIB_SUFFIX@","so")	202	ifeq ("@LIB_SUFFIX@","so")
203	$(LIB_SHARED): $(OBJECTS) $(LDDEPS)	203	$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
204	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \	204	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
205	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@	205	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
206	endif	206	endif
207		207
208	ifeq ("@LIB_SUFFIX@","dylib")	208	ifeq ("@LIB_SUFFIX@","dylib")
209	$(LIB_SHARED): $(OBJECTS) $(LDDEPS)	209	$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
210	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \	210	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
211	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@	211	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
212	endif	212	endif
213		213
214	%.so: %.a	214	%.so: %.a
215	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \	215	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
216	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \	216	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) -o $@ \
217	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@	217	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
218		218
219	$(LIB_STATIC): $(OBJECTS)	219	$(LIB_STATIC): $(OBJECTS)
220	$(RM) $@	220	$(RM) $@

Lines 102-125 include $(top_srcdir)/make.tmpl Link Here

(-)LVM2.2.02.45.old/tools/Makefile.in (-9 / +8 lines)
102	device-mapper: dmsetup	102	device-mapper: dmsetup
103		103
104	dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)	104	dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
105	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \	105	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_srcdir)/libdm -L$(DESTDIR)/lib \
106	-L$(top_srcdir)/libdm -L$(DESTDIR)/lib -ldevmapper $(LIBS)	106	-o $@ dmsetup.o -ldevmapper $(LIBS)
107		107
108	dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a	108	dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
109	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \	109	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -L$(DESTDIR)/lib \
110	-L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \	110	-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
111	$(LIB_PTHREAD)
112		111
113	all: device-mapper	112	all: device-mapper
114		113
115	lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a	114	lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
116	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \	115	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
117	$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic	116	$(LVMLIBS) $(LIBS) -rdynamic
118		117
119	LIB_PTHREAD = @LIB_PTHREAD@	118	LIB_PTHREAD = @LIB_PTHREAD@
120	lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a $(interfacedir)/libdevmapper.a	119	lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a $(interfacedir)/libdevmapper.a
121	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \	120	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ $(OBJECTS) lvm-static.o \
122	-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic	121	$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
123		122
124	liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o	123	liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
125	cat $(top_srcdir)/lib/liblvm.a > $@	124	cat $(top_srcdir)/lib/liblvm.a > $@

Lines 39-50 include $(top_srcdir)/make.tmpl Link Here

(-)LVM2.2.02.45.old/daemons/dmeventd/Makefile.in (-4 / +3 lines)
39	all: dmeventd	39	all: dmeventd
40	device-mapper: dmeventd	40	device-mapper: dmeventd
41		41
42	LDFLAGS += -ldl -ldevmapper -lpthread	42	LIBS += -ldl -ldevmapper -lpthread
43	CLDFLAGS += -ldl -ldevmapper -lpthread
44		43
45	dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o	44	dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
46	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \	45	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
47	-L. -ldevmapper-event $(LIBS) -rdynamic	46	-ldevmapper-event $(LIBS) -rdynamic
48		47
49	.PHONY: install_dynamic install_static install_include \	48	.PHONY: install_dynamic install_static install_include \
50	install_pkgconfig install_dmeventd	49	install_pkgconfig install_dmeventd