diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-09 20:38:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 20:38:07 +0200 |
| commit | fc73dd4bdf96cbab00e7d5de67ec56503c6d9783 (patch) | |
| tree | 573180d0bff416bd056836667b6f09ded881890f /ripngd | |
| parent | Merge pull request #892 from opensourcerouting/watchfrr-simplify (diff) | |
| parent | build: non-recursive babeld & eigrpd (diff) | |
| download | frr-fc73dd4bdf96cbab00e7d5de67ec56503c6d9783.tar.xz frr-fc73dd4bdf96cbab00e7d5de67ec56503c6d9783.zip | |
Merge pull request #911 from opensourcerouting/non-recursive-2
more non-recursive build, fix cross-compile, & doc build mangling
Diffstat (limited to 'ripngd')
| -rw-r--r-- | ripngd/.gitignore | 2 | ||||
| -rw-r--r-- | ripngd/Makefile | 10 | ||||
| -rw-r--r-- | ripngd/Makefile.am | 28 | ||||
| -rw-r--r-- | ripngd/subdir.am | 36 |
4 files changed, 47 insertions, 29 deletions
diff --git a/ripngd/.gitignore b/ripngd/.gitignore index e871fae3e..213384d13 100644 --- a/ripngd/.gitignore +++ b/ripngd/.gitignore @@ -1,4 +1,4 @@ -Makefile +!Makefile Makefile.in *.o ripngd diff --git a/ripngd/Makefile b/ripngd/Makefile new file mode 100644 index 000000000..5b76bb2b4 --- /dev/null +++ b/ripngd/Makefile @@ -0,0 +1,10 @@ +all: ALWAYS + @$(MAKE) -s -C .. ripngd/ripngd +%: ALWAYS + @$(MAKE) -s -C .. ripngd/$@ + +Makefile: + #nothing +ALWAYS: +.PHONY: ALWAYS makefiles +.SUFFIXES: diff --git a/ripngd/Makefile.am b/ripngd/Makefile.am deleted file mode 100644 index 3a4be999a..000000000 --- a/ripngd/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with automake to produce Makefile.in. - -AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -INSTALL_SDATA=@INSTALL@ -m 600 - -AM_CFLAGS = $(WERROR) - -noinst_LIBRARIES = libripng.a -sbin_PROGRAMS = ripngd - -libripng_a_SOURCES = \ - ripng_memory.c \ - ripng_interface.c ripngd.c ripng_zebra.c ripng_route.c ripng_debug.c \ - ripng_routemap.c ripng_offset.c ripng_peer.c ripng_nexthop.c - -noinst_HEADERS = \ - ripng_memory.h \ - ripng_debug.h ripng_route.h ripngd.h ripng_nexthop.h - -ripngd_SOURCES = \ - ripng_main.c $(libripng_a_SOURCES) - -ripngd_LDADD = ../lib/libfrr.la @LIBCAP@ - -examplesdir = $(exampledir) -dist_examples_DATA = ripngd.conf.sample - diff --git a/ripngd/subdir.am b/ripngd/subdir.am new file mode 100644 index 000000000..1f7ff09d6 --- /dev/null +++ b/ripngd/subdir.am @@ -0,0 +1,36 @@ +# +# ripngd +# + +if RIPNGD +noinst_LIBRARIES += ripngd/libripng.a +sbin_PROGRAMS += ripngd/ripngd +endif + +ripngd_libripng_a_SOURCES = \ + ripngd/ripng_debug.c \ + ripngd/ripng_interface.c \ + ripngd/ripng_memory.c \ + ripngd/ripng_nexthop.c \ + ripngd/ripng_offset.c \ + ripngd/ripng_peer.c \ + ripngd/ripng_route.c \ + ripngd/ripng_routemap.c \ + ripngd/ripng_zebra.c \ + ripngd/ripngd.c \ + # end + +noinst_HEADERS += \ + ripngd/ripng_debug.h \ + ripngd/ripng_memory.h \ + ripngd/ripng_nexthop.h \ + ripngd/ripng_route.h \ + ripngd/ripngd.h \ + # end + +ripngd_ripngd_LDADD = ripngd/libripng.a lib/libfrr.la @LIBCAP@ +ripngd_ripngd_SOURCES = \ + ripngd/ripng_main.c \ + # end + +dist_examples_DATA += ripngd/ripngd.conf.sample |