build: non-recursive debianpkg

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/Makefile.am b/Makefile.am
index 9f15f838dc9b570a40d4bb41c5271b59f2d1c2f6..3168f9d54877a51be502e32ed707bf42c657b8b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,7 @@ include watchfrr/subdir.am
 include qpb/subdir.am
 include fpm/subdir.am
 include tools/subdir.am
+include debianpkg/subdir.am
 
 include ripd/subdir.am
 include ripngd/subdir.am
@@ -73,7 +74,6 @@ DIST_SUBDIRS = . bgpd \
          vtysh tests \
          solaris bgpd/rfp-example/librfp \
          bgpd/rfp-example/rfptest \
-         debianpkg \
          # end
 
 if PKGSRC

diff --git a/configure.ac b/configure.ac
index 8000aff04e2ecc12e09ace9331dfbc6df48c47f4..0e70c86f3fe7833d2eaf6ed76f4e25c84a1d9d1f 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1988,7 +1988,6 @@ AC_CONFIG_FILES([Makefile
          bgpd/rfp-example/rfptest/Makefile
          bgpd/rfp-example/librfp/Makefile
          redhat/frr.spec
-         debianpkg/Makefile
          debianpkg/changelog
          alpine/APKBUILD
          snapcraft/snapcraft.yaml

diff --git a/debianpkg/Makefile.am b/debianpkg/Makefile.am
deleted file mode 100644 (file)
index e7ae4bb..0000000
--- a/debianpkg/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-EXTRA_DIST = README.Debian README.Maintainer \
-       changelog compat control copyright \
-       rules source/format tests/control \
-       tests/daemons watchfrr.rc \
-       backports/README backports/rules \
-        backports/debian8/debian/source/format \
-        backports/debian8/exclude \
-        backports/debian8/versionext \
-        backports/debian9/debian/source/format \
-        backports/debian9/exclude \
-        backports/debian9/versionext \
-       backports/ubuntu12.04/debian/control \
-       backports/ubuntu12.04/debian/frr.install \
-       backports/ubuntu12.04/debian/frr.postinst \
-       backports/ubuntu12.04/debian/frr.postrm \
-       backports/ubuntu12.04/debian/rules \
-       backports/ubuntu12.04/debian/source/format \
-       backports/ubuntu12.04/exclude \
-       backports/ubuntu12.04/versionext \
-       backports/ubuntu14.04/debian/control \
-       backports/ubuntu14.04/debian/frr.install \
-       backports/ubuntu14.04/debian/frr.postinst \
-       backports/ubuntu14.04/debian/frr.postrm \
-       backports/ubuntu14.04/debian/rules \
-       backports/ubuntu14.04/debian/source/format \
-       backports/ubuntu14.04/exclude \
-       backports/ubuntu14.04/versionext \
-       backports/ubuntu16.04/debian/source/format \
-       backports/ubuntu16.04/exclude \
-       backports/ubuntu16.04/versionext \
-       backports/ubuntu17.10/debian/control \
-       backports/ubuntu17.10/debian/source/format \
-       backports/ubuntu17.10/exclude \
-       backports/ubuntu17.10/versionext \
-       backports/ubuntu18.04/debian/control \
-       backports/ubuntu18.04/debian/source/format \
-       backports/ubuntu18.04/exclude \
-       backports/ubuntu18.04/versionext \
-       frr-doc.docs frr-doc.info frr-doc.install \
-       frr-doc.lintian-overrides frr.conf \
-       frr-dbg.lintian-overrides \
-       frr.dirs frr.docs frr.install \
-       frr.lintian-overrides frr.logrotate \
-       frr.manpages frr.pam frr.postinst frr.postrm \
-       frr.preinst frr.prerm \
-       frr-pythontools.install

diff --git a/debianpkg/subdir.am b/debianpkg/subdir.am
new file mode 100644 (file)
index 0000000..b625196
--- /dev/null
+++ b/debianpkg/subdir.am
@@ -0,0 +1,72 @@
+#
+# debianpkg
+#
+
+EXTRA_DIST += \
+       debianpkg/README.Debian \
+       debianpkg/README.Maintainer \
+       debianpkg/changelog \
+       debianpkg/compat \
+       debianpkg/control \
+       debianpkg/copyright \
+       debianpkg/rules \
+       debianpkg/source/format \
+       debianpkg/tests/control \
+       debianpkg/tests/daemons \
+       debianpkg/watchfrr.rc \
+       \
+       debianpkg/backports/README \
+       debianpkg/backports/rules \
+       debianpkg/backports/debian8/debian/source/format \
+       debianpkg/backports/debian8/exclude \
+       debianpkg/backports/debian8/versionext \
+       debianpkg/backports/debian9/debian/source/format \
+       debianpkg/backports/debian9/exclude \
+       debianpkg/backports/debian9/versionext \
+       debianpkg/backports/ubuntu12.04/debian/control \
+       debianpkg/backports/ubuntu12.04/debian/frr.install \
+       debianpkg/backports/ubuntu12.04/debian/frr.postinst \
+       debianpkg/backports/ubuntu12.04/debian/frr.postrm \
+       debianpkg/backports/ubuntu12.04/debian/rules \
+       debianpkg/backports/ubuntu12.04/debian/source/format \
+       debianpkg/backports/ubuntu12.04/exclude \
+       debianpkg/backports/ubuntu12.04/versionext \
+       debianpkg/backports/ubuntu14.04/debian/control \
+       debianpkg/backports/ubuntu14.04/debian/frr.install \
+       debianpkg/backports/ubuntu14.04/debian/frr.postinst \
+       debianpkg/backports/ubuntu14.04/debian/frr.postrm \
+       debianpkg/backports/ubuntu14.04/debian/rules \
+       debianpkg/backports/ubuntu14.04/debian/source/format \
+       debianpkg/backports/ubuntu14.04/exclude \
+       debianpkg/backports/ubuntu14.04/versionext \
+       debianpkg/backports/ubuntu16.04/debian/source/format \
+       debianpkg/backports/ubuntu16.04/exclude \
+       debianpkg/backports/ubuntu16.04/versionext \
+       debianpkg/backports/ubuntu17.10/debian/control \
+       debianpkg/backports/ubuntu17.10/debian/source/format \
+       debianpkg/backports/ubuntu17.10/exclude \
+       debianpkg/backports/ubuntu17.10/versionext \
+       debianpkg/backports/ubuntu18.04/debian/control \
+       debianpkg/backports/ubuntu18.04/debian/source/format \
+       debianpkg/backports/ubuntu18.04/exclude \
+       debianpkg/backports/ubuntu18.04/versionext \
+       \
+       debianpkg/frr-dbg.lintian-overrides \
+       debianpkg/frr-doc.docs \
+       debianpkg/frr-doc.info \
+       debianpkg/frr-doc.install \
+       debianpkg/frr-doc.lintian-overrides \
+       debianpkg/frr-pythontools.install \
+       debianpkg/frr.conf \
+       debianpkg/frr.dirs \
+       debianpkg/frr.docs \
+       debianpkg/frr.install \
+       debianpkg/frr.lintian-overrides \
+       debianpkg/frr.logrotate \
+       debianpkg/frr.manpages \
+       debianpkg/frr.pam \
+       debianpkg/frr.postinst \
+       debianpkg/frr.postrm \
+       debianpkg/frr.preinst \
+       debianpkg/frr.prerm \
+       # end