Attachment #196217 for bug #217644

Lines 83-89 INSTALL_TARGETS = \ Link Here

(-)LVM2.2.02.36.old/daemons/clvmd/Makefile.in (-1 / +1 lines)
83	install_clvmd	83	install_clvmd
84		84
85	clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a	85	clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
86	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \	86	$(CC) $(CFLAGS) $(LDFLAGS) -o clvmd $(OBJECTS) \
87	$(LVMLIBS) $(LMLIBS) $(LIBS)	87	$(LVMLIBS) $(LMLIBS) $(LIBS)
88		88
89	.PHONY: install_clvmd	89	.PHONY: install_clvmd

Lines 17-23 top_srcdir = @top_srcdir@ Link Here

(-)LVM2.2.02.36.old/dmeventd/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 -llvm2cmd	20	CLDFLAGS += -L${top_srcdir}/tools
		21	LIBS += -ldevmapper -llvm2cmd
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.36.old/dmeventd/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 -llvm2cmd	20	CLDFLAGS += -L${top_srcdir}/tools
		21	LIBS += -ldevmapper -llvm2cmd
21		22
22	SOURCES = dmeventd_snapshot.c	23	SOURCES = dmeventd_snapshot.c
23		24

Lines 135-141 ifeq ("@HAVE_LIBDL@", "yes") Link Here

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

Lines 184-191 endif Link Here

(-)LVM2.2.02.36.old/make.tmpl.in (-2 / +2 lines)
184		184
185	%.so: %.a	185	%.so: %.a
186	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \	186	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
187	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \	187	$(CFLAGS) $(CLDFLAGS) -o $@ \
188	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@	188	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
189		189
190	$(LIB_STATIC): $(OBJECTS)	190	$(LIB_STATIC): $(OBJECTS)
191	$(RM) $@	191	$(RM) $@

Lines 103-110 lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/ Link Here

(-)LVM2.2.02.36.old/tools/Makefile.in (-2 / +2 lines)
103		103
104	LIB_PTHREAD = @LIB_PTHREAD@	104	LIB_PTHREAD = @LIB_PTHREAD@
105	lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a	105	lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
106	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \	106	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) lvm-static.o -static \
107	$(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic	107	$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
108		108
109	liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o	109	liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
110	cat $(top_srcdir)/lib/liblvm.a > $@	110	cat $(top_srcdir)/lib/liblvm.a > $@

Return to bug 217644