From 1dbc6a5a5bef9348168708c85bee74c69c89550e Mon Sep 17 00:00:00 2001 Message-Id: <1dbc6a5a5bef9348168708c85bee74c69c89550e.1718468641.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 14 Mar 2021 16:14:33 +0000 Subject: [PATCH] build: Switch to using the new subtree version of CFD. Organization: Straylight/Edgeware From: Mark Wooding --- .gitignore | 28 +++++++++++++++++----------- .links | 9 --------- COPYING | 1 + COPYING.LIB | 1 + Makefile.am | 1 + config/auto-version | 1 + config/confsubst | 1 + config/maninst | 1 + configure.ac | 1 + debian/control | 2 +- debian/rules | 3 --- m4/mdw-auto-version.m4 | 1 + m4/mdw-define-paths.m4 | 1 + m4/mdw-libtool-version-info.m4 | 1 + m4/mdw-manext.m4 | 1 + m4/mdw-silent-rules.m4 | 1 + t/autotest.am | 1 + t/testsuite.at | 1 + ui/mdwopt.c | 1 + ui/mdwopt.h | 1 + 20 files changed, 34 insertions(+), 24 deletions(-) delete mode 100644 .links create mode 120000 COPYING create mode 120000 COPYING.LIB create mode 120000 config/auto-version create mode 120000 config/confsubst create mode 120000 config/maninst create mode 120000 m4/mdw-auto-version.m4 create mode 120000 m4/mdw-define-paths.m4 create mode 120000 m4/mdw-libtool-version-info.m4 create mode 120000 m4/mdw-manext.m4 create mode 120000 m4/mdw-silent-rules.m4 create mode 120000 t/autotest.am create mode 120000 t/testsuite.at create mode 120000 ui/mdwopt.c create mode 120000 ui/mdwopt.h diff --git a/.gitignore b/.gitignore index 32d2ec1..52c8a19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,30 @@ ## Pervasive build machinery. Makefile.in -## Common source files. -/ui/mdwopt.c -/ui/mdwopt.h - -## Other common files. -/COPYING.LIB -/COPYING - ## Top-level generated files. /aclocal.m4 /autom4te.cache/ /configure -/config/ /precomp/ +## Skeleton configuration header. +/config/config.h.in + +## GNU build system machinery installed by `autoreconf'. +/config/compile +/config/config.guess +/config/config.sub +/config/depcomp +/config/install-sh +/config/ltmain.sh +/config/missing + +## m4 configuration macros installed by `aclocal' and `libtoolize'. +/m4/ax_*.m4 +/m4/libtool.m4 +/m4/lt*.m4 + ## Test machinery. -/t/autotest.am /t/package.m4 -/t/testsuite.at /t/testsuite /t/tests.m4 diff --git a/.links b/.links deleted file mode 100644 index e342330..0000000 --- a/.links +++ /dev/null @@ -1,9 +0,0 @@ -config/maninst -config/auto-version -config/confsubst -ui/mdwopt.c -ui/mdwopt.h -t/autotest.am -t/testsuite.at -COPYING -COPYING.LIB diff --git a/COPYING b/COPYING new file mode 120000 index 0000000..782bd18 --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +.ext/cfd/licence/GPL-2 \ No newline at end of file diff --git a/COPYING.LIB b/COPYING.LIB new file mode 120000 index 0000000..8d44cb9 --- /dev/null +++ b/COPYING.LIB @@ -0,0 +1 @@ +.ext/cfd/licence/LGPL-2 \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index 48f2317..310ba82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ ### MA 02111-1307, USA. include $(top_srcdir)/vars.am +ACLOCAL_AMFLAGS = -Im4 SUBDIRS = diff --git a/config/auto-version b/config/auto-version new file mode 120000 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 index 0000000..8e7de22 --- /dev/null +++ b/config/confsubst @@ -0,0 +1 @@ +../.ext/cfd/build/confsubst \ No newline at end of file diff --git a/config/maninst b/config/maninst new file mode 120000 index 0000000..3298bb0 --- /dev/null +++ b/config/maninst @@ -0,0 +1 @@ +../.ext/cfd/build/maninst \ No newline at end of file diff --git a/configure.ac b/configure.ac index 60f82b9..cd3d3c1 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ mdw_AUTO_VERSION AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib]) AC_CONFIG_SRCDIR([mLib.pc.in]) AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects]) mdw_SILENT_RULES diff --git a/debian/control b/debian/control index 54a8976..d2630fc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mlib Section: libs Priority: extra Maintainer: Mark Wooding -Build-Depends: debhelper (>= 10), python, libadns1-dev +Build-Depends: debhelper (>= 10), autoconf-archive, python, libadns1-dev Standards-Version: 3.1.1 Package: mlib2 diff --git a/debian/rules b/debian/rules index 4bd7c2c..9f93fcc 100755 --- a/debian/rules +++ b/debian/rules @@ -58,9 +58,6 @@ DH_install_OPTIONS_adns = --destdir=debian/tmp-adns ###-------------------------------------------------------------------------- ### Additional tweaks. -## Don't try to rebuild our configure script. -DH_OPTIONS += --without=autoreconf - ## Some of the install lists need to be generated. This is a little ## annoying. GEN_INSTALL_PKGS = mlib2-adns diff --git a/m4/mdw-auto-version.m4 b/m4/mdw-auto-version.m4 new file mode 120000 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-define-paths.m4 b/m4/mdw-define-paths.m4 new file mode 120000 index 0000000..59213bf --- /dev/null +++ b/m4/mdw-define-paths.m4 @@ -0,0 +1 @@ +../.ext/cfd/m4/mdw-define-paths.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 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-manext.m4 b/m4/mdw-manext.m4 new file mode 120000 index 0000000..56bc718 --- /dev/null +++ b/m4/mdw-manext.m4 @@ -0,0 +1 @@ +../.ext/cfd/m4/mdw-manext.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 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 diff --git a/t/autotest.am b/t/autotest.am new file mode 120000 index 0000000..2309b1e --- /dev/null +++ b/t/autotest.am @@ -0,0 +1 @@ +../.ext/cfd/build/autotest.am \ No newline at end of file diff --git a/t/testsuite.at b/t/testsuite.at new file mode 120000 index 0000000..78fa5b5 --- /dev/null +++ b/t/testsuite.at @@ -0,0 +1 @@ +../.ext/cfd/build/testsuite.at \ No newline at end of file diff --git a/ui/mdwopt.c b/ui/mdwopt.c new file mode 120000 index 0000000..9bbcb66 --- /dev/null +++ b/ui/mdwopt.c @@ -0,0 +1 @@ +../.ext/cfd/src/mdwopt.c \ No newline at end of file diff --git a/ui/mdwopt.h b/ui/mdwopt.h new file mode 120000 index 0000000..7d2644a --- /dev/null +++ b/ui/mdwopt.h @@ -0,0 +1 @@ +../.ext/cfd/src/mdwopt.h \ No newline at end of file -- [mdw]