diff -Naurp LVM2.2.02.36.old/daemons/clvmd/Makefile.in LVM2.2.02.36/daemons/clvmd/Makefile.in
--- LVM2.2.02.36.old/daemons/clvmd/Makefile.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/daemons/clvmd/Makefile.in	2009-06-30 23:54:18.000000000 +0200
@@ -83,7 +83,7 @@ INSTALL_TARGETS = \
 	install_clvmd
 
 clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
+	$(CC) $(CFLAGS) $(LDFLAGS) -o clvmd $(OBJECTS) \
 		$(LVMLIBS) $(LMLIBS) $(LIBS)
 
 .PHONY: install_clvmd
diff -Naurp LVM2.2.02.36.old/dmeventd/mirror/Makefile.in LVM2.2.02.36/dmeventd/mirror/Makefile.in
--- LVM2.2.02.36.old/dmeventd/mirror/Makefile.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/dmeventd/mirror/Makefile.in	2009-07-01 00:06:10.000000000 +0200
@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd
+CLDFLAGS += -L${top_srcdir}/tools
+LIBS += -ldevmapper -llvm2cmd
 
 SOURCES = dmeventd_mirror.c
 
diff -Naurp LVM2.2.02.36.old/dmeventd/snapshot/Makefile.in LVM2.2.02.36/dmeventd/snapshot/Makefile.in
--- LVM2.2.02.36.old/dmeventd/snapshot/Makefile.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/dmeventd/snapshot/Makefile.in	2009-07-01 00:06:01.000000000 +0200
@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 INCLUDES += -I${top_srcdir}/tools
-CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd
+CLDFLAGS += -L${top_srcdir}/tools
+LIBS += -ldevmapper -llvm2cmd
 
 SOURCES = dmeventd_snapshot.c
 
diff -Naurp LVM2.2.02.36.old/lib/Makefile.in LVM2.2.02.36/lib/Makefile.in
--- LVM2.2.02.36.old/lib/Makefile.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/lib/Makefile.in	2009-06-30 23:37:26.000000000 +0200
@@ -135,7 +135,7 @@ ifeq ("@HAVE_LIBDL@", "yes")
 endif
 
 ifeq ("@DMEVENTD@", "yes")
-  CLDFLAGS += -ldevmapper-event
+  LIBS += -ldevmapper-event
 endif
 
 LIB_STATIC = liblvm.a
diff -Naurp LVM2.2.02.36.old/make.tmpl.in LVM2.2.02.36/make.tmpl.in
--- LVM2.2.02.36.old/make.tmpl.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/make.tmpl.in	2009-06-30 23:36:30.000000000 +0200
@@ -184,8 +184,8 @@ endif
 
 %.so: %.a
 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
-	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+	$(CFLAGS) $(CLDFLAGS) -o $@ \
+	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
 
 $(LIB_STATIC): $(OBJECTS)
 	$(RM) $@
diff -Naurp LVM2.2.02.36.old/tools/Makefile.in LVM2.2.02.36/tools/Makefile.in
--- LVM2.2.02.36.old/tools/Makefile.in	2009-06-30 23:35:57.000000000 +0200
+++ LVM2.2.02.36/tools/Makefile.in	2009-06-30 23:51:50.000000000 +0200
@@ -103,8 +103,8 @@ lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/
 
 LIB_PTHREAD = @LIB_PTHREAD@
 lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
-	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
-		$(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) lvm-static.o -static \
+		$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
 
 liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
 	cat $(top_srcdir)/lib/liblvm.a > $@