r81 - in devmapper/trunk: debian lib

[Bastian Blank]

Author: waldi
Date: Mon Mar 14 19:42:35 2005
New Revision: 81

Modified:
   devmapper/trunk/debian/libdevmapper-dev.install
   devmapper/trunk/debian/rules
   devmapper/trunk/lib/Makefile.in
Log:
* debian/libdevmapper-dev.install: Install static library.
* debian/rules: Fix.
* lib/Makefile.in
  - Build and install static library.
  - Static libs have no version.


Modified: devmapper/trunk/debian/libdevmapper-dev.install
==============================================================================
--- devmapper/trunk/debian/libdevmapper-dev.install	(original)
+++ devmapper/trunk/debian/libdevmapper-dev.install	Mon Mar 14 19:42:35 2005
@@ -1 +1,2 @@
 usr/include/libdevmapper.h
+lib/libdevmapper.a usr/lib

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Mon Mar 14 19:42:35 2005
@@ -76,8 +76,6 @@
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
-#	dh_perl -a
-	dh_python -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a

Modified: devmapper/trunk/lib/Makefile.in
==============================================================================
--- devmapper/trunk/lib/Makefile.in	(original)
+++ devmapper/trunk/lib/Makefile.in	Mon Mar 14 19:42:35 2005
@@ -32,11 +32,7 @@
 .PHONY: install_dynamic install_static \
 	install_fs install_ioctl install_ioctl_static
 
-INSTALL_TYPE = install_dynamic
-
-ifeq ("@STATIC_LINK@", "yes")
-  INSTALL_TYPE += install_static
-endif
+INSTALL_TYPE = install_dynamic install_static
 
 install: $(INSTALL_TYPE)
 
@@ -46,7 +42,6 @@
 		$(includedir)/libdevmapper.h
 
 install_static: install_@interface@_static
-	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
 
@@ -60,7 +55,7 @@
 
 install_ioctl_static: ioctl/libdevmapper.a
 	$(INSTALL) -D $(OWNER) $(GROUP) -m 755 $(STRIP) $< \
-		$(libdir)/libdevmapper.a.$(LIB_VERSION)
+		$(libdir)/libdevmapper.a
 
 .PHONY: distclean_lib distclean