ospf6d: fix heap use after free

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 699c530eebdc560ad9895f012164fd162a5492b2..89e7ea890e2be5b979a9d384993757f1bd78e628 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,21 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @VTYSH@ @OSPFCLIENT@ doc
+SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
+        @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
+         @ISISD@ @PIMD@ @NHRPD@ \
+        @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
+         redhat @SOLARIS@ tests tools cumulus snapcraft
 
-DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
-              ospfclient doc
+DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
+         isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
+         solaris pimd nhrpd @LIBRFP@ @RFPTEST@ tools cumulus snapcraft
 
-EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-       vtysh/Makefile.am update-autotools doc/mpls
+EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
+       update-autotools \
+       vtysh/Makefile.in vtysh/Makefile.am \
+       tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
+       tools/zebra.el tools/multiple-bgpd.sh
 
-dist-hook:
-       mkdir $(distdir)/tools
-       cp -p $(srcdir)/tools/*.pl $(distdir)/tools
-       cp -p $(srcdir)/tools/*.el $(distdir)/tools
-       cp -p $(srcdir)/tools/*.cgi $(distdir)/tools
-       cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
-       cp -p $(srcdir)/redhat/quagga.* $(distdir)/redhat
-       rm -rf `find $(distdir)/doc -type d -name CVS`
+ACLOCAL_AMFLAGS = -I m4
+
+noinst_HEADERS = defaults.h