Merge remote-tracking branch 'origin/master' into datacenter

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1b97d58c493f05303201a9b962fd09ff78d116c7..d87b5943d87a421d5bb4cb484fd96d8a764e74b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,21 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @ISISD@ @PIMD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@ tests
+SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
+        @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
+         @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ \
+        @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
+         redhat @SOLARIS@ tests tools snapcraft
 
-DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
-         isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \
-         solaris pimd
+DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
+         isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
+         solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools snapcraft
 
-EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS INSTALL.quagga.txt \
+EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
        update-autotools \
        vtysh/Makefile.in vtysh/Makefile.am \
-       tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
-       tools/zebra.el tools/multiple-bgpd.sh \
-       fpm/fpm.h
-
-if HAVE_LATEX
-
-HACKING.pdf: HACKING.tex
-       $(LATEXMK) -pdf $<
-
-clean-local:
-       -$(LATEXMK) -C HACKING.tex
-
-endif
+       tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
+       tools/zebra.el tools/multiple-bgpd.sh
 
 ACLOCAL_AMFLAGS = -I m4
-ACLOCAL_LDFLAGS = -ljson
+
+noinst_HEADERS = defaults.h