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 /nhrpd | |
| 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 'nhrpd')
| -rw-r--r-- | nhrpd/.gitignore | 1 | ||||
| -rw-r--r-- | nhrpd/Makefile | 10 | ||||
| -rw-r--r-- | nhrpd/Makefile.am | 47 | ||||
| -rw-r--r-- | nhrpd/subdir.am | 43 |
4 files changed, 54 insertions, 47 deletions
diff --git a/nhrpd/.gitignore b/nhrpd/.gitignore index 3d4d56d58..3f4738127 100644 --- a/nhrpd/.gitignore +++ b/nhrpd/.gitignore @@ -1 +1,2 @@ +!Makefile nhrpd diff --git a/nhrpd/Makefile b/nhrpd/Makefile new file mode 100644 index 000000000..62c954602 --- /dev/null +++ b/nhrpd/Makefile @@ -0,0 +1,10 @@ +all: ALWAYS + @$(MAKE) -s -C .. nhrpd/nhrpd +%: ALWAYS + @$(MAKE) -s -C .. nhrpd/$@ + +Makefile: + #nothing +ALWAYS: +.PHONY: ALWAYS makefiles +.SUFFIXES: diff --git a/nhrpd/Makefile.am b/nhrpd/Makefile.am deleted file mode 100644 index 64d9e09bf..000000000 --- a/nhrpd/Makefile.am +++ /dev/null @@ -1,47 +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 -DQUAGGA_NO_DEPRECATED_INTERFACES -DEFS = @DEFS@ @CARES_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -INSTALL_SDATA=@INSTALL@ -m 600 - -AM_CFLAGS = $(PICFLAGS) $(WERROR) -AM_LDFLAGS = $(PICLDFLAGS) - -sbin_PROGRAMS = nhrpd - -nhrpd_SOURCES = \ - zbuf.c \ - znl.c \ - resolver.c \ - linux.c \ - netlink_arp.c \ - netlink_gre.c \ - vici.c \ - reqid.c \ - nhrp_event.c \ - nhrp_packet.c \ - nhrp_interface.c \ - nhrp_vc.c \ - nhrp_peer.c \ - nhrp_cache.c \ - nhrp_nhs.c \ - nhrp_route.c \ - nhrp_shortcut.c \ - nhrp_vty.c \ - nhrp_main.c - -nhrpd_LDADD = ../lib/libfrr.la @LIBCAP@ @CARES_LIBS@ - -noinst_HEADERS = \ - debug.h \ - list.h \ - netlink.h \ - nhrp_protocol.h \ - nhrpd.h \ - os.h \ - vici.h \ - zbuf.h \ - znl.h \ - # end - -#dist_examples_DATA = nhrpd.conf.sample diff --git a/nhrpd/subdir.am b/nhrpd/subdir.am new file mode 100644 index 000000000..5b06946c8 --- /dev/null +++ b/nhrpd/subdir.am @@ -0,0 +1,43 @@ +# +# nhrpd +# + +if NHRPD +sbin_PROGRAMS += nhrpd/nhrpd +endif + +nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@ +nhrpd_nhrpd_CFLAGS = $(AM_CFLAGS) @CARES_CFLAGS@ +nhrpd_nhrpd_SOURCES = \ + nhrpd/linux.c \ + nhrpd/netlink_arp.c \ + nhrpd/netlink_gre.c \ + nhrpd/nhrp_cache.c \ + nhrpd/nhrp_event.c \ + nhrpd/nhrp_interface.c \ + nhrpd/nhrp_main.c \ + nhrpd/nhrp_nhs.c \ + nhrpd/nhrp_packet.c \ + nhrpd/nhrp_peer.c \ + nhrpd/nhrp_route.c \ + nhrpd/nhrp_shortcut.c \ + nhrpd/nhrp_vc.c \ + nhrpd/nhrp_vty.c \ + nhrpd/reqid.c \ + nhrpd/resolver.c \ + nhrpd/vici.c \ + nhrpd/zbuf.c \ + nhrpd/znl.c \ + # end + +noinst_HEADERS += \ + nhrpd/debug.h \ + nhrpd/list.h \ + nhrpd/netlink.h \ + nhrpd/nhrp_protocol.h \ + nhrpd/nhrpd.h \ + nhrpd/os.h \ + nhrpd/vici.h \ + nhrpd/zbuf.h \ + nhrpd/znl.h \ + # end |