diff options
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rwxr-xr-x | configure.ac | 5 | ||||
| -rw-r--r-- | tools/.gitignore | 1 | ||||
| -rw-r--r-- | tools/Makefile | 10 | ||||
| -rw-r--r-- | tools/Makefile.am | 16 | ||||
| -rw-r--r-- | tools/subdir.am | 27 | ||||
| -rw-r--r-- | watchfrr/.gitignore | 2 | ||||
| -rw-r--r-- | watchfrr/Makefile | 10 | ||||
| -rw-r--r-- | watchfrr/Makefile.am | 11 | ||||
| -rw-r--r-- | watchfrr/subdir.am | 17 |
10 files changed, 74 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index f204f8a724..ae586d1ccc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ examplesdir = $(exampledir) bin_PROGRAMS = sbin_PROGRAMS = +sbin_SCRIPTS = noinst_PROGRAMS = noinst_HEADERS = noinst_LIBRARIES = @@ -35,8 +36,10 @@ $(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES include lib/subdir.am include zebra/subdir.am +include watchfrr/subdir.am include qpb/subdir.am include fpm/subdir.am +include tools/subdir.am include ripd/subdir.am include ripngd/subdir.am @@ -52,13 +55,13 @@ include eigrpd/subdir.am SUBDIRS = . @LIBRFP@ @RFPTEST@ \ @BGPD@ \ @PIMD@ \ - @WATCHFRR@ @VTYSH@ @DOC@ \ - @SOLARIS@ tests tools + @VTYSH@ @DOC@ \ + @SOLARIS@ tests DIST_SUBDIRS = . bgpd \ - watchfrr vtysh doc tests \ + vtysh doc tests \ solaris pimd bgpd/rfp-example/librfp \ - bgpd/rfp-example/rfptest tools \ + bgpd/rfp-example/rfptest \ # end if PKGSRC @@ -100,12 +103,6 @@ EXTRA_DIST += \ 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 diff --git a/configure.ac b/configure.ac index 3daf01fcc5..5b78e6accf 100755 --- a/configure.ac +++ b/configure.ac @@ -1337,8 +1337,6 @@ AC_SUBST(RFPTEST) AC_SUBST(LIBRFP) AC_SUBST(RFPINC) AC_SUBST(BGPD) -AC_SUBST(WATCHFRR) -AC_SUBST(ISISD) AC_SUBST(PIMD) AC_SUBST(SOLARIS) AC_SUBST(VTYSH) @@ -1812,12 +1810,11 @@ AC_CACHE_VAL(ac_cv_htonl_works, AC_MSG_RESULT($ac_cv_htonl_works) AC_CONFIG_FILES([Makefile - bgpd/Makefile watchfrr/Makefile + bgpd/Makefile vtysh/Makefile doc/Makefile tests/Makefile bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile pimd/Makefile - tools/Makefile redhat/frr.spec snapcraft/snapcraft.yaml lib/version.h diff --git a/tools/.gitignore b/tools/.gitignore index 2e3b89cc26..7bf3be9dbf 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,3 +1,4 @@ +!Makefile .arch-inventory .arch-ids diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 0000000000..0614da7d11 --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,10 @@ +all: ALWAYS + @echo please specify a target to build +%: ALWAYS + @$(MAKE) -s -C .. tools/$@ + +Makefile: + #nothing +ALWAYS: +.PHONY: ALWAYS makefiles +.SUFFIXES: diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index e5a118972b..0000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -AM_CFLAGS = $(WERROR) -EXTRA_DIST = - -bin_PROGRAMS = permutations -sbin_PROGRAMS = ssd - -permutations_SOURCES = permutations.c -permutations_LDADD = ../lib/libfrr.la - -sbin_SCRIPTS = frr-reload.py frr - -EXTRA_DIST += frr.service frr-reload.py frr etc - -ssd_SOURCES = start-stop-daemon.c diff --git a/tools/subdir.am b/tools/subdir.am new file mode 100644 index 0000000000..79aea179a9 --- /dev/null +++ b/tools/subdir.am @@ -0,0 +1,27 @@ +# +# tools +# + +noinst_PROGRAMS += tools/permutations +sbin_PROGRAMS += tools/ssd +sbin_SCRIPTS += \ + tools/frr-reload.py \ + tools/frr \ + # end + +tools_permutations_SOURCES = tools/permutations.c +tools_permutations_LDADD = lib/libfrr.la + +tools_ssd_SOURCES = tools/start-stop-daemon.c + +EXTRA_DIST += \ + tools/etc \ + tools/frr \ + tools/frr-reload.py \ + tools/frr.service \ + tools/multiple-bgpd.sh \ + tools/rrcheck.pl \ + tools/rrlookup.pl \ + tools/zc.pl \ + tools/zebra.el \ + # end diff --git a/watchfrr/.gitignore b/watchfrr/.gitignore index d3b038feb5..b8c020c04c 100644 --- a/watchfrr/.gitignore +++ b/watchfrr/.gitignore @@ -1,4 +1,4 @@ -Makefile +!Makefile Makefile.in *.o watchfrr diff --git a/watchfrr/Makefile b/watchfrr/Makefile new file mode 100644 index 0000000000..91ad59ce1c --- /dev/null +++ b/watchfrr/Makefile @@ -0,0 +1,10 @@ +all: ALWAYS + @$(MAKE) -s -C .. watchfrr/watchfrr +%: ALWAYS + @$(MAKE) -s -C .. watchfrr/$@ + +Makefile: + #nothing +ALWAYS: +.PHONY: ALWAYS makefiles +.SUFFIXES: diff --git a/watchfrr/Makefile.am b/watchfrr/Makefile.am deleted file mode 100644 index bb53641eff..0000000000 --- a/watchfrr/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -## Process this file with Automake to create Makefile.in - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -AM_CFLAGS = $(WERROR) - -sbin_PROGRAMS = watchfrr - -noinst_HEADERS = watchfrr.h - -watchfrr_SOURCES = watchfrr.c watchfrr_vty.c -watchfrr_LDADD = ../lib/libfrr.la @LIBCAP@ diff --git a/watchfrr/subdir.am b/watchfrr/subdir.am new file mode 100644 index 0000000000..aa1a4403bc --- /dev/null +++ b/watchfrr/subdir.am @@ -0,0 +1,17 @@ +# +# watchfrr +# + +if WATCHFRR +sbin_PROGRAMS += watchfrr/watchfrr +endif + +noinst_HEADERS += \ + watchfrr/watchfrr.h \ + # end + +watchfrr_watchfrr_LDADD = lib/libfrr.la @LIBCAP@ +watchfrr_watchfrr_SOURCES = \ + watchfrr/watchfrr.c \ + watchfrr/watchfrr_vty.c \ + # end |