ospf6d: fix metric type of NSSA Type-7 LSAs

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a5101df2f0eec2b11f4e199e4d953af42b692f1b..ce0f70a1a294043f17f989b15b75cdb80f5ce760 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,11 @@ AM_CFLAGS = \
        $(SAN_FLAGS) \
        $(WERROR) \
        # end
+AM_CXXFLAGS = \
+       $(AC_CXXFLAGS) \
+       $(LIBYANG_CFLAGS) \
+       $(WERROR) \
+       # end
 
 # CPPFLAGS_BASE does not contain the include path for overriding assert.h,
 # therefore should be used in tools that do *not* link libfrr or do not want
@@ -24,11 +29,33 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/assert \
        $(CPPFLAGS_BASE) \
        # end
+
+# AM_LDFLAGS is used for executables (daemons).  LDFLAGS can be left alone,
+# but if it is changed it should include $(AM_LDFLAGS)
 AM_LDFLAGS = \
        -export-dynamic \
        $(AC_LDFLAGS) \
+       $(AC_LDFLAGS_EXEC) \
+       $(SAN_FLAGS) \
+       # end
+
+# libraries need to use libxxx_LDFLAGS = $(LIB_LDFLAGS) -version-info X:Y:Z
+LIB_LDFLAGS = \
+       -export-dynamic \
+       $(AC_LDFLAGS) \
+       $(SAN_FLAGS) \
+       # end
+
+# modules need to use xxx_LDFLAGS = $(MODULE_LDFLAGS)
+MODULE_LDFLAGS = \
+       -export-dynamic \
+       -avoid-version \
+       -module \
+       -shared \
+       $(AC_LDFLAGS) \
        $(SAN_FLAGS) \
        # end
+
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE)
 
 AR_FLAGS = @AR_FLAGS@
@@ -104,8 +131,6 @@ CLEANFILES =
 DISTCLEANFILES =
 SUFFIXES =
 
-examplesdir = $(exampledir)
-
 bin_PROGRAMS =
 sbin_PROGRAMS =
 sbin_SCRIPTS =
@@ -117,7 +142,6 @@ lib_LTLIBRARIES =
 module_LTLIBRARIES =
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
-dist_examples_DATA =
 dist_yangmodels_DATA =
 man_MANS =
 vtysh_scan =
@@ -193,8 +217,6 @@ EXTRA_DIST += \
        m4/README.txt \
        m4/libtool-whole-archive.patch \
        config.version \
-       changelog-auto \
-       changelog-auto.in \
        \
        python/clidef.py \
        python/clippy/__init__.py \