diff -Naurp -Naurp LVM2.2.02.45.old/daemons/clogd/Makefile LVM2.2.02.45/daemons/clogd/Makefile
--- LVM2.2.02.45.old/daemons/clogd/Makefile	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/daemons/clogd/Makefile	2009-07-01 01:07:51.000000000 +0200
@@ -45,12 +45,12 @@ LDFLAGS += $(shell if [ -e /usr/lib64/op
 	else \
 		echo '-L/usr/lib/openais -L/usr/lib'; \
 	fi)
-LDFLAGS += -lcpg -lSaCkpt -lext2fs
+LIBS += -lcpg -lSaCkpt -lext2fs
 
 all: ${TARGET}
 
 clogd: ${SOURCES}
-	${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^
 
 no_clogd_kernel_headers:
 	echo "Unable to find clogd kernel headers"
diff -Naurp -Naurp LVM2.2.02.45.old/daemons/clvmd/Makefile.in LVM2.2.02.45/daemons/clvmd/Makefile.in
--- LVM2.2.02.45.old/daemons/clvmd/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/daemons/clvmd/Makefile.in	2009-07-01 00:56:29.000000000 +0200
@@ -101,7 +101,7 @@ INSTALL_TARGETS = \
 	install_clvmd
 
 clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
+	$(CC) -o clvmd $(CFLAGS) $(LDFLAGS) $(OBJECTS) \
 		$(LVMLIBS) $(LMLIBS) $(LIBS)
 
 .PHONY: install_clvmd
diff -Naurp -Naurp LVM2.2.02.45.old/daemons/dmeventd/Makefile.in LVM2.2.02.45/daemons/dmeventd/Makefile.in
--- LVM2.2.02.45.old/daemons/dmeventd/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/daemons/dmeventd/Makefile.in	2009-07-01 02:38:05.000000000 +0200
@@ -39,12 +39,11 @@ include $(top_srcdir)/make.tmpl
 all: dmeventd
 device-mapper: dmeventd
 
-LDFLAGS += -ldl -ldevmapper -lpthread
-CLDFLAGS += -ldl -ldevmapper -lpthread
+LIBS += -ldl -ldevmapper -lpthread
 
 dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
-	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
-	-L. -ldevmapper-event $(LIBS) -rdynamic
+	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
+	-ldevmapper-event $(LIBS) -rdynamic
 
 .PHONY: install_dynamic install_static install_include \
 	install_pkgconfig install_dmeventd
diff -Naurp -Naurp LVM2.2.02.45.old/daemons/dmeventd/plugins/mirror/Makefile.in LVM2.2.02.45/daemons/dmeventd/plugins/mirror/Makefile.in
--- LVM2.2.02.45.old/daemons/dmeventd/plugins/mirror/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/daemons/dmeventd/plugins/mirror/Makefile.in	2009-07-01 23:14:48.000000000 +0200
@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
+CLDFLAGS += -L${top_srcdir}/tools
+LIBS += -ldevmapper -lpthread @LVM2CMD_LIB@
 
 SOURCES = dmeventd_mirror.c
 
diff -Naurp -Naurp LVM2.2.02.45.old/daemons/dmeventd/plugins/snapshot/Makefile.in LVM2.2.02.45/daemons/dmeventd/plugins/snapshot/Makefile.in
--- LVM2.2.02.45.old/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-07-01 23:16:34.000000000 +0200
@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
+CLDFLAGS += -L${top_srcdir}/tools
+LIBS += -lpthread -ldevmapper @LVM2CMD_LIB@
 
 SOURCES = dmeventd_snapshot.c
 
diff -Naurp -Naurp LVM2.2.02.45.old/lib/Makefile.in LVM2.2.02.45/lib/Makefile.in
--- LVM2.2.02.45.old/lib/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/lib/Makefile.in	2009-07-01 01:03:28.000000000 +0200
@@ -137,7 +137,7 @@ ifeq ("@HAVE_LIBDL@", "yes")
 endif
 
 ifeq ("@DMEVENTD@", "yes")
-  CLDFLAGS += -ldevmapper-event
+  LIBS += -ldevmapper-event
 endif
 
 LIB_STATIC = liblvm.a
diff -Naurp -Naurp LVM2.2.02.45.old/make.tmpl.in LVM2.2.02.45/make.tmpl.in
--- LVM2.2.02.45.old/make.tmpl.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/make.tmpl.in	2009-07-01 02:17:14.000000000 +0200
@@ -28,7 +28,7 @@ GENHTML = @GENHTML@
 LN_S = @LN_S@
 SED = @SED@
 
-LIBS = @LIBS@
+LIBS += @LIBS@ $(LVMLIBS) $(LMLIBS)
 DEFS += @DEFS@
 CFLAGS += @CFLAGS@
 CLDFLAGS += @CLDFLAGS@
@@ -202,19 +202,19 @@ $(TARGETS): $(OBJECTS)
 ifeq ("@LIB_SUFFIX@","so")
 $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 ifeq ("@LIB_SUFFIX@","dylib")
 $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 %.so: %.a
 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
-	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) -o $@ \
+	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
 
 $(LIB_STATIC): $(OBJECTS)
 	$(RM) $@
diff -Naurp -Naurp LVM2.2.02.45.old/test/api/Makefile.in LVM2.2.02.45/test/api/Makefile.in
--- LVM2.2.02.45.old/test/api/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/test/api/Makefile.in	2009-07-01 01:10:10.000000000 +0200
@@ -35,5 +35,5 @@ LDFLAGS += -L$(top_srcdir)/api/lib
 include $(top_srcdir)/make.tmpl
 
 test: $(OBJECTS) $(top_srcdir)/lib/liblvm.a $(top_srcdir)/libdm/libdevmapper.so
-	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o test $(OBJECTS) $(LVMLIBS) $(LIBS)
 
diff -Naurp -Naurp LVM2.2.02.45.old/tools/Makefile.in LVM2.2.02.45/tools/Makefile.in
--- LVM2.2.02.45.old/tools/Makefile.in	2009-07-01 00:55:16.000000000 +0200
+++ LVM2.2.02.45/tools/Makefile.in	2009-07-01 23:19:26.000000000 +0200
@@ -102,24 +102,23 @@ include $(top_srcdir)/make.tmpl
 device-mapper: dmsetup
 
 dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
-	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \
-	      -L$(top_srcdir)/libdm -L$(DESTDIR)/lib -ldevmapper $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_srcdir)/libdm -L$(DESTDIR)/lib \
+		-o $@ dmsetup.o -ldevmapper $(LIBS)
 
 dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
-	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
-	      -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \
-	      $(LIB_PTHREAD)
+	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -L$(DESTDIR)/lib \
+		-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
 
 all: device-mapper
 
 lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
-		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+	$(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) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
-		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+	$(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 > $@