Update build machinery to use in-tree Common Files Distribution.

Most significantly, the package can now be built directly from Git.

diff --git a/.gitignore b/.gitignore
index 160b512411b44457879be858e608510de40ff135..250428fe707e7aa17a18884517817d8de96f442a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,21 @@
-/COPYING
-

 /Makefile.in
 /configure
 
 /aclocal.m4
 /autom4te.cache/
 /Makefile.in
 /configure
 
 /aclocal.m4
 /autom4te.cache/

-/config/
+
+/config/compile
+/config/config.guess
+/config/config.h.in
+/config/config.sub
+/config/depcomp
+/config/install-sh
+/config/ltmain.sh
+/config/missing
+
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+

diff --git a/.links b/.links
deleted file mode 100644 (file)
index 5a93e8f..0000000
--- a/.links
+++ /dev/null
@@ -1,3 +0,0 @@
-COPYING
-config/auto-version
-config/confsubst

diff --git a/COPYING b/COPYING
new file mode 120000 (symlink)
index 0000000..782bd18
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+.ext/cfd/licence/GPL-2
\ No newline at end of file

diff --git a/Makefile.am b/Makefile.am
index 9785ae144f4d4ee720d13b2a39c1f4d645c812f1..739a72dbd53fdcb62f3b7396a3fc884e7ebf54c5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@
 ### along with chkpath; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ### along with chkpath; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

+ACLOCAL_AMFLAGS                 = -Im4
+

 bin_PROGRAMS            =
 lib_LTLIBRARIES                 =
 noinst_LIBRARIES        =
 bin_PROGRAMS            =
 lib_LTLIBRARIES                 =
 noinst_LIBRARIES        =

diff --git a/config/auto-version b/config/auto-version
new file mode 120000 (symlink)
index 0000000..652e105
--- /dev/null
+++ b/config/auto-version
@@ -0,0 +1 @@
+../.ext/cfd/build/auto-version
\ No newline at end of file

diff --git a/config/confsubst b/config/confsubst
new file mode 120000 (symlink)
index 0000000..8e7de22
--- /dev/null
+++ b/config/confsubst
@@ -0,0 +1 @@
+../.ext/cfd/build/confsubst
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 759333e912e0792b5324f68a84acaead38cfe7d0..f892d24943d849120158dacfc5d5a518fe001b3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ mdw_AUTO_VERSION
 AC_INIT([Checkpath], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([checkpath.c])
 AC_CONFIG_AUX_DIR([config])
 AC_INIT([Checkpath], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([checkpath.c])
 AC_CONFIG_AUX_DIR([config])

+AC_CONFIG_MACRO_DIRS([m4])

 mdw_SILENT_RULES
 AM_INIT_AUTOMAKE([foreign])
 
 mdw_SILENT_RULES
 AM_INIT_AUTOMAKE([foreign])
 

diff --git a/debian/control b/debian/control
index 45971a2c48523571645f9d77ea6744e0703a9efe..63af45e70ece0e4f8f92d4c11b53eda422b56bde 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: admin
 Priority: extra
 Build-Depends:
        debhelper (>= 8),
 Priority: extra
 Build-Depends:
        debhelper (>= 8),

+       autoconf, automake, libtool, autoconf-archive,

        pkg-config,
        mlib-dev (>= 2.0.4)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
        pkg-config,
        mlib-dev (>= 2.0.4)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>

diff --git a/debian/rules b/debian/rules
index 881796298a308f89ee0bcd3eb7426fcdd76da609..6000c39c2f8a3c27b7aebd357cd1568aaa68684d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,2 +1,2 @@
 #! /usr/bin/make -f
 #! /usr/bin/make -f

-%:; dh $@ --builddirectory=debian/build
+%:; dh $@ --builddirectory=debian/build --with=autoreconf

diff --git a/m4/mdw-auto-version.m4 b/m4/mdw-auto-version.m4
new file mode 120000 (symlink)
index 0000000..db358e4
--- /dev/null
+++ b/m4/mdw-auto-version.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-auto-version.m4
\ No newline at end of file

diff --git a/m4/mdw-libtool-version-info.m4 b/m4/mdw-libtool-version-info.m4
new file mode 120000 (symlink)
index 0000000..3298202
--- /dev/null
+++ b/m4/mdw-libtool-version-info.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-libtool-version-info.m4
\ No newline at end of file

diff --git a/m4/mdw-silent-rules.m4 b/m4/mdw-silent-rules.m4
new file mode 120000 (symlink)
index 0000000..52d11e3
--- /dev/null
+++ b/m4/mdw-silent-rules.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-silent-rules.m4
\ No newline at end of file