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

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 63dedeac06f9c7dbf0215ab55f4b3ee347e27d75..d87b5943d87a421d5bb4cb484fd96d8a764e74b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,13 @@
 
 SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
         @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
-         @ISISD@ @PIMD@ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@ tests tools cumulus snapcraft
+         @ISISD@ @PIMD@ @NHRPD@ @EIGRPD@ \
+        @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
+         redhat @SOLARIS@ tests tools snapcraft
 
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
          isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
-         solaris pimd @LIBRFP@ @RFPTEST@ tools cumulus snapcraft
+         solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools snapcraft
 
 EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
        update-autotools \
@@ -16,3 +17,5 @@ EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
        tools/zebra.el tools/multiple-bgpd.sh
 
 ACLOCAL_AMFLAGS = -I m4
+
+noinst_HEADERS = defaults.h