From 53d93be147de81b6efbaff0eecfbff076e1f02ca Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 31 Jul 2017 22:05:56 +0200 Subject: [PATCH] build: non-recursive auxiliary directories Flatten {m4,pkgsrc,python,redhat,snapcraft}/Makefile.am into the main one. Signed-off-by: David Lamparter --- Makefile.am | 59 +++++++++++++++++++++++++++++++++++++------ configure.ac | 11 +++----- m4/Makefile.am | 1 - pkgsrc/Makefile.am | 3 --- python/Makefile.am | 3 --- redhat/Makefile.am | 5 ---- snapcraft/Makefile.am | 8 ------ 7 files changed, 54 insertions(+), 36 deletions(-) delete mode 100644 m4/Makefile.am delete mode 100644 pkgsrc/Makefile.am delete mode 100644 python/Makefile.am delete mode 100644 redhat/Makefile.am delete mode 100644 snapcraft/Makefile.am diff --git a/Makefile.am b/Makefile.am index 53693ae4d..7cfe4a97e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,20 +32,63 @@ include fpm/subdir.am SUBDIRS = . @LIBRFP@ @RFPTEST@ \ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \ @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ @BABELD@ \ - @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \ - redhat @SOLARIS@ tests tools snapcraft + @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ \ + @SOLARIS@ tests tools DIST_SUBDIRS = . bgpd ripd ripngd ospfd ospf6d ldpd \ - isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ + isisd watchfrr vtysh ospfclient doc tests \ solaris pimd nhrpd eigrpd bgpd/rfp-example/librfp \ - bgpd/rfp-example/rfptest tools snapcraft babeld python \ + bgpd/rfp-example/rfptest tools babeld \ # end -EXTRA_DIST += aclocal.m4 SERVICES REPORTING-BUGS \ +if PKGSRC +rcdir=@pkgsrcrcdir@ +rc_SCRIPTS = \ + pkgsrc/bgpd.sh \ + pkgsrc/ospf6d.sh \ + pkgsrc/ospfd.sh \ + pkgsrc/ripd.sh \ + pkgsrc/ripngd.sh \ + pkgsrc/zebra.sh \ + # end +endif + +EXTRA_DIST += \ + REPORTING-BUGS \ + SERVICES \ + aclocal.m4 \ update-autotools \ - vtysh/Makefile.in vtysh/Makefile.am \ - tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \ - tools/zebra.el tools/multiple-bgpd.sh + m4/README.txt \ + \ + python/clidef.py \ + python/clippy/__init__.py \ + \ + redhat/frr.init \ + redhat/frr.service \ + redhat/daemons \ + redhat/frr.logrotate \ + redhat/frr.pam \ + redhat/frr.spec \ + redhat/README.rpm_build.md \ + \ + snapcraft/snapcraft.yaml \ + snapcraft/README.snap_build.md \ + snapcraft/README.usage.md \ + snapcraft/extra_version_info.txt \ + snapcraft/scripts \ + snapcraft/defaults \ + snapcraft/helpers \ + snapcraft/snap \ + \ + tools/multiple-bgpd.sh \ + tools/rrcheck.pl \ + tools/rrlookup.pl \ + tools/zc.pl \ + tools/zebra.el \ + \ + vtysh/Makefile.am \ + vtysh/Makefile.in \ + # end ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 1ba501ee4..8cc70f8a9 100755 --- a/configure.ac +++ b/configure.ac @@ -75,14 +75,13 @@ AC_SUBST(exampledir) dnl default is to match previous behavior pkgsrcrcdir="" -pkgsrcdir="" AC_ARG_ENABLE([pkgsrcrcdir], AS_HELP_STRING([--enable-pkgsrcrcdir], [specify directory for rc.d scripts]), - pkgsrcrcdir="$enableval"; pkgsrcdir="pkgsrc",) + pkgsrcrcdir="$enableval",) dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow -AC_SUBST(pkgsrcdir) AC_SUBST(pkgsrcrcdir) +AM_CONDITIONAL([PKGSRC], [test "x$pkgsrcrcdir" != "x"]) AC_ARG_WITH([moduledir], [AS_HELP_STRING([--with-moduledir=DIR], [module directory (${libdir}/frr/modules)])], [ moduledir="$withval" @@ -1823,18 +1822,14 @@ AC_MSG_RESULT($ac_cv_htonl_works) AC_CONFIG_FILES([Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile watchfrr/Makefile ospf6d/Makefile ldpd/Makefile isisd/Makefile vtysh/Makefile - doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile + doc/Makefile ospfclient/Makefile tests/Makefile bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile babeld/Makefile pimd/Makefile eigrpd/Makefile nhrpd/Makefile - redhat/Makefile tools/Makefile - pkgsrc/Makefile - python/Makefile redhat/frr.spec - snapcraft/Makefile snapcraft/snapcraft.yaml lib/version.h tests/lib/cli/test_cli.refout diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 49a29bdf1..000000000 --- a/m4/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST=Makefile.am README.txt diff --git a/pkgsrc/Makefile.am b/pkgsrc/Makefile.am deleted file mode 100644 index 622fbf074..000000000 --- a/pkgsrc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -rcdir=@pkgsrcrcdir@ - -rc_SCRIPTS = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh diff --git a/python/Makefile.am b/python/Makefile.am deleted file mode 100644 index 4ad1e36b5..000000000 --- a/python/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ - clidef.py \ - clippy/__init__.py diff --git a/redhat/Makefile.am b/redhat/Makefile.am deleted file mode 100644 index 74856cfd8..000000000 --- a/redhat/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -EXTRA_DIST = frr.init frr.service daemons \ - frr.logrotate frr.pam frr.spec \ - README.rpm_build.md - diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am deleted file mode 100644 index a8220670d..000000000 --- a/snapcraft/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = snapcraft.yaml \ - README.snap_build.md \ - README.usage.md \ - extra_version_info.txt \ - scripts \ - defaults \ - helpers \ - snap -- 2.39.5