LVM2/daemons/dmeventd Makefile.in

LVM2/daemons/dmeventd Makefile.in

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-05-14 13:36:56

Modified files:
	daemons/dmeventd: Makefile.in 

Log message:
	Fix static build.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.43&r2=1.44

--- LVM2/daemons/dmeventd/Makefile.in	2010/05/11 08:57:02	1.43
+++ LVM2/daemons/dmeventd/Makefile.in	2010/05/14 13:36:56	1.44
@@ -62,7 +62,7 @@
 
 dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
 
 ifeq ("@PKGCONFIG@", "yes")
   INSTALL_LIB_TARGETS += install_pkgconfig

LVM2/daemons/dmeventd Makefile.in

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-03-29 14:07:01

Modified files:
	daemons/dmeventd: Makefile.in 

Log message:
	Add $(LIB_STATIC) to TARGETS so it's cleaned in the same way
	as other libraries in project.
	Add dmeventd.gcda dmeventd.gcno to CLEAN_TARGETS.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.36&r2=1.37

--- LVM2/daemons/dmeventd/Makefile.in	2010/03/04 12:10:41	1.36
+++ LVM2/daemons/dmeventd/Makefile.in	2010/03/29 14:07:01	1.37
@@ -26,9 +26,10 @@
 INSTALL_DMEVENTD_TARGETS = install_dmeventd_dynamic
 INSTALL_LIB_TARGETS = install_lib_dynamic
 
+LIB_NAME = libdevmapper-event
 ifeq ("@STATIC_LINK@", "yes")
-  LIB_STATIC = libdevmapper-event.a
-  TARGETS += dmeventd.static
+  LIB_STATIC = $(LIB_NAME).a
+  TARGETS += $(LIB_STATIC) dmeventd.static
   INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
   INSTALL_LIB_TARGETS += install_lib_static
 endif
@@ -36,13 +37,13 @@
 LIB_VERSION = $(LIB_VERSION_DM)
 
 ifeq ("@LIB_SUFFIX@","dylib")
-  LIB_SHARED = libdevmapper-event.dylib
+  LIB_SHARED = $(LIB_NAME).dylib
 else
-  LIB_SHARED = libdevmapper-event.so
+  LIB_SHARED = $(LIB_NAME).so
   VERSIONED_SHLIB = $(LIB_SHARED).$(LIB_VERSION)
 endif
 
-CLEAN_TARGETS = dmeventd.o dmeventd.static
+CLEAN_TARGETS = dmeventd.o dmeventd.static dmeventd.gcda dmeventd.gcno
 
 ifneq ($(MAKECMDGOALS),device-mapper)
   SUBDIRS+=plugins

LVM2/daemons/dmeventd Makefile.in

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-05-11 10:12:35

Modified files:
	daemons/dmeventd: Makefile.in 

Log message:
	Do not use generic install if running install_device-mapper.
	
	It propagates into subdirs which includes DSOs which requires
	lvm2 build (only install_device-mapper should propagate there).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.24&r2=1.25

--- LVM2/daemons/dmeventd/Makefile.in	2009/04/08 14:04:35	1.24
+++ LVM2/daemons/dmeventd/Makefile.in	2009/05/11 10:12:35	1.25
@@ -63,7 +63,7 @@
 
 install: $(INSTALL_TYPE) install_include install_dmeventd
 
-install_device-mapper: install
+install_device-mapper: $(INSTALL_TYPE) install_include install_dmeventd
 
 install_include:
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \