r497 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 11:20:36 2008
New Revision: 497

Log:
* debian: Update svn:ignore property.
* debian/rules: Update.


Modified:
   devmapper/trunk/debian/   (props changed)
   devmapper/trunk/debian/rules

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Wed Jan  2 11:20:36 2008
@@ -17,15 +17,17 @@
 LIBDEVMAPPER_ABINAME = 1.02.1
 
 BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
 
 PACKAGES_DEB := libdevmapper-dev libdevmapper$(LIBDEVMAPPER_ABINAME) dmsetup
 PACKAGES_UDEB := libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb dmsetup-udeb
 
-$(BUILD_DIR)/build-deb/config.status: DIR = $(BUILD_DIR)/build-deb
-$(BUILD_DIR)/build-deb/config.status:
-	dh_testdir
+setup: $(STAMPS_DIR)/setup
+$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
 
-	rm -rf $(DIR)
+$(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
+$(STAMPS_DIR)/setup-deb:
+	@rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
@@ -40,11 +42,11 @@
 		--with-device-uid=0 \
 		--with-device-gid=6 \
 		--with-device-mode=0660
+	touch $@
 
-$(BUILD_DIR)/build-udeb/config.status: DIR = $(BUILD_DIR)/build-udeb
-$(BUILD_DIR)/build-udeb/config.status:
+$(STAMPS_DIR)/setup-udeb: DIR = $(BUILD_DIR)/build-udeb
+$(STAMPS_DIR)/setup-udeb:
 	dh_testdir
-
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
@@ -58,33 +60,34 @@
 		--with-optimisation=-Os \
 		--enable-compat \
 		--disable-selinux
+	touch $@
 
-build: build-deb build-udeb
+build: $(STAMPS_DIR)/build
+$(STAMPS_DIR)/build: $(STAMPS_DIR)/setup $(STAMPS_DIR)/build-deb $(STAMPS_DIR)/build-udeb
 
-build-deb: $(BUILD_DIR)/build-deb-stamp
-$(BUILD_DIR)/build-deb-stamp: DIR = $(BUILD_DIR)/build-deb
-$(BUILD_DIR)/build-deb-stamp: $(BUILD_DIR)/build-deb/config.status
+build-deb: $(STAMPS_DIR)/build-deb
+$(STAMPS_DIR)/build-deb: DIR = $(BUILD_DIR)/build-deb
+$(STAMPS_DIR)/build-deb: $(STAMPS_DIR)/setup-deb
 	dh_testdir
-
 	$(MAKE) -C $(DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
-
 	touch $@
 
-build-udeb: $(BUILD_DIR)/build-udeb-stamp
-$(BUILD_DIR)/build-udeb-stamp: DIR = $(BUILD_DIR)/build-udeb
-$(BUILD_DIR)/build-udeb-stamp: $(BUILD_DIR)/build-udeb/config.status
+build-udeb: $(STAMPS_DIR)/build-udeb
+$(STAMPS_DIR)/build-udeb: DIR = $(BUILD_DIR)/build-udeb
+$(STAMPS_DIR)/build-udeb: $(STAMPS_DIR)/setup-udeb
 	dh_testdir
-
 	$(MAKE) -C $(DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
-
 	touch $@
 
+$(BUILD_DIR) $(STAMPS_DIR):
+	@[ -d $@ ] || mkdir $@
+
 maintainerclean:
 	rm -rf $(filter-out .svn .svk debian, $(wildcard * .[^.]*))
 
 clean:
 	dh_testdir
-	rm -rf $(BUILD_DIR)
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
 install: install-deb install-udeb
@@ -92,50 +95,47 @@
 install-deb: export DH_OPTIONS = $(addprefix -p,$(PACKAGES_DEB))
 install-deb: DIR = $(BUILD_DIR)/build-deb
 install-deb: INSTALL_DIR = $(BUILD_DIR)/install-deb
-install-deb: build-deb
+install-deb: $(STAMPS_DIR)/build-deb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	rm -rf $(INSTALL_DIR)
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
-
 	dh_install --sourcedir=$(INSTALL_DIR)
+	dh_installchangelogs WHATS_NEW
+	dh_installdocs
+	dh_installinit -- start 25 S .
+	dh_strip
+	dh_link -p libdevmapper-dev lib/libdevmapper.so.$(LIBDEVMAPPER_ABINAME) usr/lib/libdevmapper.so
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -p 'libdevmapper$(LIBDEVMAPPER_ABINAME)' --add-udeb 'libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb' -V
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 install-udeb: export DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
 install-udeb: DIR = $(BUILD_DIR)/build-udeb
 install-udeb: INSTALL_DIR = $(BUILD_DIR)/install-udeb
-install-udeb: build-udeb
+install-udeb: $(STAMPS_DIR)/build-udeb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	echo $(DH_OPTIONS)
-
-	rm -rf $(INSTALL_DIR)
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION=$(LIBDEVMAPPER_ABINAME)
-
 	dh_install --sourcedir=$(INSTALL_DIR)
+	dh_installdocs
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-# Build architecture-independent files here.
 binary-indep:
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs WHATS_NEW -a
-	dh_installdocs -a
-	dh_installinit -a -- start 25 S .
-	dh_strip -a
-	dh_link -p libdevmapper-dev lib/libdevmapper.so.$(LIBDEVMAPPER_ABINAME) usr/lib/libdevmapper.so
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -p 'libdevmapper$(LIBDEVMAPPER_ABINAME)' --add-udeb 'libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb' -V
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+binary-arch: install
 
 binary: binary-indep binary-arch