summaryrefslogtreecommitdiffstats
path: root/daemons/dmeventd
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2010-04-09 21:42:48 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2010-04-09 21:42:48 +0000
commit23b059e7b7559280966b806e30d5b1e9c1ecfeaa (patch)
tree9048a37126534d34c906b0cd34a46af4e68975de /daemons/dmeventd
parentc737d348045479f71ea7d31eaeadda16eea94aa9 (diff)
downloadlvm2-23b059e7b7559280966b806e30d5b1e9c1ecfeaa.tar.gz
lvm2-23b059e7b7559280966b806e30d5b1e9c1ecfeaa.tar.xz
lvm2-23b059e7b7559280966b806e30d5b1e9c1ecfeaa.zip
INSTALL rules updates
Patch is inspired by Debian's extra patch. - removes OWNER & GROUP make vars they are parts of INSTALL command. - adds INSTALL_PROGRAM for executable, uses $(INSTALL) - adds INSTALL_DATA for non-executable data, uses ($INSTALL) - adds INSTALL_WDATA for writable non-executable data, uses ($INSTALL) - adds configure option --enable-write_install - to support installatin of writable files used by distribution - replaces usage of ifeq @LIB_SUFFIX@ with $(LIB_SUFFIX) - installs .a files from static builds without executable flag - installs .a files to $(usrlibdir) instead of $(libdir) - installs all static binaries to $(staticdir) - create .so links for devel package in $(usrlibdir) instead of $(libdir) - makes .so and .so.LIB_VERSION files within builddir - removes VERSIONED_SHLIB and created versioned LIB_SHARED automagicaly - install LIB_SHARED via install_lib_shared target - install plugins via install_lib_shared_plugin target - prints whole 'install' command during installation instead of less informative "Installing $(something) $(somewhere)" - install multiple man pages with one INSTALL command - use DISTCLEAN_TARGETS instead of creating multiple distclean targets
Diffstat (limited to 'daemons/dmeventd')
-rw-r--r--daemons/dmeventd/Makefile.in47
-rw-r--r--daemons/dmeventd/plugins/lvm2/Makefile.in11
-rw-r--r--daemons/dmeventd/plugins/mirror/Makefile.in11
-rw-r--r--daemons/dmeventd/plugins/snapshot/Makefile.in11
4 files changed, 18 insertions, 62 deletions
diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index e0a63495..fb4f8f51 100644
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -36,13 +36,7 @@ ifeq ("@STATIC_LINK@", "yes")
endif
LIB_VERSION = $(LIB_VERSION_DM)
-
-ifeq ("@LIB_SUFFIX@","dylib")
- LIB_SHARED = $(LIB_NAME).dylib
-else
- LIB_SHARED = $(LIB_NAME).so
- VERSIONED_SHLIB = $(LIB_SHARED).$(LIB_VERSION)
-endif
+LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
CLEAN_TARGETS = dmeventd.static $(LIB_NAME).a
@@ -61,11 +55,7 @@ device-mapper: $(TARGETS)
LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
-$(VERSIONED_SHLIB): $(LIB_SHARED)
- $(RM) -f $@
- $(LN_S) $(LIB_SHARED) $@
-
-dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
+dmeventd: $(LIB_SHARED) dmeventd.o
$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
@@ -86,32 +76,24 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-include $(top_builddir)/daemons/dmeventd/plugins/mirror/$(LIB_NAME)-lvm2mirror.cflow
endif
-install_include:
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper-event.h \
- $(includedir)/libdevmapper-event.h
+install_include: $(srcdir)/libdevmapper-event.h
+ $(INSTALL_DATA) -D $< $(includedir)/$(<F)
-install_pkgconfig:
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
- $(usrlibdir)/pkgconfig/devmapper-event.pc
+install_pkgconfig: libdevmapper-event.pc
+ $(INSTALL_DATA) -D $< $(usrlibdir)/pkgconfig/devmapper-event.pc
-install_lib_dynamic: libdevmapper-event.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
- $(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
- $(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+install_lib_dynamic: install_lib_shared
-install_lib_static: libdevmapper-event.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
- $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
+install_lib_static: $(LIB_STATIC)
+ $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
install_lib: $(INSTALL_LIB_TARGETS)
install_dmeventd_dynamic: dmeventd
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
install_dmeventd_static: dmeventd.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
install_dmeventd: $(INSTALL_DMEVENTD_TARGETS)
@@ -119,9 +101,4 @@ install: install_include install_lib install_dmeventd
install_device-mapper: install_include install_lib install_dmeventd
-.PHONY: distclean_lib
-
-distclean_lib:
- $(RM) libdevmapper-event.pc
-
-distclean: distclean_lib
+DISTCLEAN_TARGETS += libdevmapper-event.pc
diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index f44a5626..75358685 100644
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -19,20 +19,13 @@ CLDFLAGS += -L$(top_builddir)/tools
SOURCES = dmeventd_lvm.c
-ifeq ("@LIB_SUFFIX@","dylib")
- LIB_SHARED = libdevmapper-event-lvm2.dylib
-else
- LIB_SHARED = libdevmapper-event-lvm2.so
-endif
+LIB_SHARED = libdevmapper-event-lvm2.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS)
-install_lvm2: libdevmapper-event-lvm2.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/$<.$(LIB_VERSION)
- $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+install_lvm2: install_lib_shared
install: install_lvm2
diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 3dfc3a22..146361fc 100644
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -22,12 +22,7 @@ CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/l
SOURCES = dmeventd_mirror.c
LIB_NAME = libdevmapper-event-lvm2mirror
-ifeq ("@LIB_SUFFIX@","dylib")
- LIB_SHARED = $(LIB_NAME).dylib
-else
- LIB_SHARED = $(LIB_NAME).so
-endif
-
+LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
CFLOW_LIST = $(SOURCES)
@@ -37,8 +32,6 @@ include $(top_builddir)/make.tmpl
LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
-install_lvm2: $(LIB_NAME).$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/$<
+install_lvm2: install_lib_shared_plugin
install: install_lvm2
diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index 0f202b38..f36f916c 100644
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -21,20 +21,13 @@ CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/l
SOURCES = dmeventd_snapshot.c
-ifeq ("@LIB_SUFFIX@","dylib")
- LIB_SHARED = libdevmapper-event-lvm2snapshot.dylib
-else
- LIB_SHARED = libdevmapper-event-lvm2snapshot.so
-endif
-
+LIB_SHARED = libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
-install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/$<
+install_lvm2: install_lib_shared_plugin
install: install_lvm2