ripd: unlink if-rmap container from global list before removing it

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d12d45264500d691fb11396be5c9c81bfccaf786..9c6c8663ee535fa82090b56c8517acb8e0fdcc4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects 1.12
 ACLOCAL_AMFLAGS = -I m4
 
 AM_CFLAGS = \
+       $(LIBYANG_CFLAGS) \
+       $(SQLITE3_CFLAGS) \
        $(UNWIND_CFLAGS) \
        $(SAN_FLAGS) \
        $(WERROR) \
@@ -17,7 +19,6 @@ AM_LDFLAGS = \
        $(SAN_FLAGS) \
        # end
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE)
-LIBCAP = @LIBCAP@
 
 AR_FLAGS = @AR_FLAGS@
 ARFLAGS = @ARFLAGS@
@@ -123,7 +124,6 @@ include watchfrr/subdir.am
 include qpb/subdir.am
 include fpm/subdir.am
 include tools/subdir.am
-include debianpkg/subdir.am
 include solaris/subdir.am
 
 include bgpd/subdir.am
@@ -149,6 +149,7 @@ include yang/libyang_plugins/subdir.am
 
 include vtysh/subdir.am
 include tests/subdir.am
+include tests/topotests/subdir.am
 
 if PKGSRC
 rcdir=@pkgsrcrcdir@
@@ -168,17 +169,15 @@ EXTRA_DIST += \
        m4/README.txt \
        m4/libtool-whole-archive.patch \
        config.version \
+       changelog-auto \
+       changelog-auto.in \
        \
        python/clidef.py \
        python/clippy/__init__.py \
        \
-       redhat/frr.init \
-       redhat/frr.service \
-       redhat/daemons \
        redhat/frr.logrotate \
        redhat/frr.pam \
        redhat/frr.spec \
-       redhat/README.rpm_build.md \
        \
        snapcraft/snapcraft.yaml \
        snapcraft/README.snap_build.md \
@@ -208,7 +207,6 @@ EXTRA_DIST += \
        ospfd/Makefile \
        pbrd/Makefile \
        pimd/Makefile \
-       ports/Makefile \
        qpb/Makefile \
        ripd/Makefile \
        ripngd/Makefile \
@@ -225,8 +223,8 @@ noinst_HEADERS += defaults.h
 clean-local: clean-python
 .PHONY: clean-python
 clean-python:
-       find -name __pycache__ -o -name .pytest_cache | xargs rm -rf
-       find -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f
+       find . -name __pycache__ -o -name .pytest_cache | xargs rm -rf
+       find . -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f
 
 redistclean:
        $(MAKE) distclean CONFIG_CLEAN_FILES="$(filter-out $(EXTRA_DIST), $(CONFIG_CLEAN_FILES))"