Merge pull request #4883 from mjstapp/dplane_vteps

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5565104c108f175fa36aa9b93df1bef5668a34d..851cefc85c5d5583957af6aa8d576bf51632e805 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ AM_CFLAGS = \
        # end
 AM_CPPFLAGS = \
        -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
-       -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
+       -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib \
+       $(LUA_INCLUDE) \
+       # end
 AM_LDFLAGS = \
        -export-dynamic \
        $(AC_LDFLAGS) \
@@ -38,6 +40,12 @@ shvar-%:
 var-%:
        @echo "$($*)" >&$(VARFD)
 
+if ONLY_CLIPPY
+.DEFAULT_GOAL := clippy-only
+endif
+clippy-only: Makefile lib/clippy config.h
+.PHONY: clippy-only
+
 # overwriting these vars breaks cross-compilation.  let's be helpful and warn.
 #
 # note: "#AUTODERP# " will be removed from Makefile by configure.  These are
@@ -96,7 +104,6 @@ noinst_LIBRARIES =
 nodist_noinst_DATA =
 lib_LTLIBRARIES =
 module_LTLIBRARIES =
-libyang_plugins_LTLIBRARIES =
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
 dist_examples_DATA =
@@ -111,7 +118,6 @@ vtysh_scan =
 $(AUTOMAKE_DUMMY)install-moduleLTLIBRARIES: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-binPROGRAMS: install-libLTLIBRARIES
 $(AUTOMAKE_DUMMY)install-sbinPROGRAMS: install-libLTLIBRARIES
-$(AUTOMAKE_DUMMY)install-libyang_pluginsLTLIBRARIES: install-libLTLIBRARIES
 
 include doc/subdir.am
 include doc/user/subdir.am
@@ -147,6 +153,7 @@ include staticd/subdir.am
 include bfdd/subdir.am
 include yang/subdir.am
 include yang/libyang_plugins/subdir.am
+include vrrpd/subdir.am
 
 include vtysh/subdir.am
 include tests/subdir.am
@@ -188,7 +195,6 @@ EXTRA_DIST += \
        snapcraft/defaults \
        snapcraft/helpers \
        snapcraft/snap \
-       \
        babeld/Makefile \
        bgpd/Makefile \
        bgpd/rfp-example/librfp/Makefile \
@@ -218,6 +224,7 @@ EXTRA_DIST += \
        vtysh/Makefile \
        watchfrr/Makefile \
        zebra/Makefile \
+       vrrpd/Makefile \
        # end
 
 noinst_HEADERS += defaults.h