Build with autotools.

 - Obsoletes build-fix patch.
 - Allows for dumb rules.

Signed-off-by: Daniel Stodden <dns@somacoma.net>

diff --git a/control b/control
index a565c9fbfecaf1ed0f5b23c4f448b53d8bf335a3..91920b75691de2f26c399d971ca8645e45c8f461 100644 (file)
--- a/control
+++ b/control
@@ -2,7 +2,7 @@ Source: blktap
 Section: libs
 Priority: optional
 Maintainer: Thomas Goirand <zigo@debian.org>
-Build-Depends: debhelper (>= 8), uuid-dev, libaio-dev
+Build-Depends: debhelper (>= 8), autotools-dev, uuid-dev, libaio-dev
 Standards-Version: 3.9.2
 Vcs-Browser: http://git.gplhost.com/gitweb/?p=sbox.git
 Vcs-Git: http://git.gplhost.com/sbox.git

diff --git a/patches/fix-install b/patches/fix-install
deleted file mode 100644 (file)
index d99c0db..0000000
--- a/patches/fix-install
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Config.mk
-+++ b/Config.mk
-@@ -12,9 +12,8 @@
- 
- SHELL     ?= /bin/sh
- 
--DESTDIR     ?= /
--SBINDIR     ?= usr/sbin
--SYSCONFDIR  ?= etc
-+SBINDIR     ?= /usr/sbin
-+SYSCONFDIR  ?= /etc
- 
- include $(BLKTAP_ROOT)/config/$(BLKTAP_OS).mk
- include $(BLKTAP_ROOT)/config/$(BLKTAP_TARGET_ARCH).mk
---- a/config/x86_32.mk
-+++ b/config/x86_32.mk
-@@ -3,4 +3,4 @@
- CONFIG_X86_$(BLKTAP_OS) := y
- 
- CFLAGS += -m32 -march=i686
--LIBDIR := lib
-+LIBDIR := /lib

diff --git a/patches/series b/patches/series
index d5fddbe8a3d986460fac38f26b8e9860ecccb523..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1 +0,0 @@
-fix-install

diff --git a/rules b/rules
index 7bc55d9a97586f173e4143964db101aa7118a8a3..3ebeffcf971868992a8546c7ad1c661e54d95287 100755 (executable)
--- a/rules
+++ b/rules
@@ -1,65 +1,8 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-build: build-arch build-indep
-build-arch: build
-build-indep: build
-build-stamp:
-       $(MAKE) USE_SYSTEM_LIBRARIES=y DESTDIR=$(CURDIR)/debian/libvhd1.0
-       touch build-stamp
+# turn on verbose mode
+export DH_VERBOSE=1
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       $(MAKE) clean
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       $(MAKE) install USE_SYSTEM_LIBRARIES=y DESTDIR=$(CURDIR)/debian/libvhd1.0/
-
-       # Move stuff in libvhdio
-       mkdir -p $(CURDIR)/debian/libvhdio1.0/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so.1.0 $(CURDIR)/debian/libvhdio1.0/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so.1.0.0 $(CURDIR)/debian/libvhdio1.0/usr/lib
-
-       # Move stuff in the -dev packages
-       mkdir -p $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/lib/libblktapctl.a $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhd.a $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhd.so $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.a $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/lib/libvhdio.so $(CURDIR)/debian/blktap-dev/usr/lib
-       mv $(CURDIR)/debian/libvhd1.0/usr/include $(CURDIR)/debian/blktap-dev/usr
-
-       # Move things in the blktap-utils package
-       mkdir -p $(CURDIR)/debian/blktap-utils/usr
-       mv $(CURDIR)/debian/libvhd1.0/usr/sbin $(CURDIR)/debian/blktap-utils/usr
-       mv $(CURDIR)/debian/libvhd1.0/etc $(CURDIR)/debian/blktap-utils
-
-       # Move things in the libblktapctl1.0 package
-       mkdir -p $(CURDIR)/debian/libblktapctl1.0/usr
-       mv $(CURDIR)/debian/libvhd1.0/lib $(CURDIR)/debian/libblktapctl1.0/usr
-
-
-binary-indep: build install
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@