make pkgconfig installation step optional, and clean up generated files

diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index ef21c7afa2a7a8a021a79d6b66146a956097c45c..df0e94a75d545d1fcfdb1f4b0f8795dd7ef8fc7b 100644 (file)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -30,7 +30,8 @@ include ../make.tmpl
 
 CLDFLAGS += -ldl -ldevmapper -lpthread
 
-.PHONY: install_dynamic install_static install_include
+.PHONY: install_dynamic install_static install_include \
+       install_pkgconfig
 
 INSTALL_TYPE = install_dynamic
 
@@ -38,6 +39,10 @@ ifeq ("@STATIC_LINK@", "yes")
   INSTALL_TYPE += install_static
 endif
 
+ifeq ("@PKGCONFIG@", "yes")
+  INSTALL_TYPE += install_pkgconfig
+endif
+
 install: $(INSTALL_TYPE)
 
 install_include:
@@ -49,6 +54,8 @@ install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
                $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
        $(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
                $(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+
+install_pkgconfig:
        $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper-event.pc \
                $(usrlibdir)/pkgconfig/libdevmapper-event.pc
 
@@ -57,3 +64,10 @@ install_static: libdevmapper-event.a
                $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
        $(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
 
+.PHONY: distclean_lib distclean
+
+distclean_lib: 
+        $(RM) libdevmapper-event.pc
+
+distclean: distclean_lib
+

diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 8fd990eca8449077ef005bc194d1795b03006d91..91e0c5d4ae2a159c75629d3a95fd88b3fcbe1669 100644 (file)
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -43,7 +43,8 @@ CFLAGS += -DDEVICE_UID=@DEVICE_UID@ -DDEVICE_GID=@DEVICE_GID@ \
 include ../make.tmpl
 
 .PHONY: install_dynamic install_static install_include \
-       install_fs install_ioctl install_ioctl_static
+       install_fs install_ioctl install_ioctl_static \
+       install_pkgconfig
 
 INSTALL_TYPE = install_dynamic
 
@@ -51,6 +52,10 @@ ifeq ("@STATIC_LINK@", "yes")
   INSTALL_TYPE += install_static
 endif
 
+ifeq ("@PKGCONFIG@", "yes")
+  INSTALL_TYPE += install_pkgconfig
+endif
+
 install: $(INSTALL_TYPE) install_include
 
 install_include:
@@ -71,6 +76,8 @@ install_fs: fs/libdevmapper.$(LIB_SUFFIX)
 install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+
+install_pkgconfig:
        $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper.pc \
                $(usrlibdir)/pkgconfig/libdevmapper.pc
 
@@ -81,7 +88,7 @@ install_ioctl_static: ioctl/libdevmapper.a
 .PHONY: distclean_lib distclean
 
 distclean_lib: 
-       $(RM) libdm-common.h
+       $(RM) libdm-common.h libdevmapper.pc
 
 distclean: distclean_lib