diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-02 10:54:27 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-09-07 16:18:50 +0200 |
| commit | bd354725a683b9fcf84e8b174e37b7466622cdf8 (patch) | |
| tree | c0a604faacce5ed390846db712b2bfd509d2a3d7 /watchfrr | |
| parent | a7e5e20a22cf875a077f4800dbbec23b6c836b03 (diff) | |
build: non-recursive watchfrr & tools
(also forgot to remove AC_SUBST(ISISD) earlier)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'watchfrr')
| -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 |
4 files changed, 28 insertions, 12 deletions
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 |