Merge pull request #10405 from kanaya516/feature/adj-sid-yang

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb8e97a115f4857bec08dc51414acef53c814e7c..44d2ab8e72b80d5533430df61f62ebb726519528 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,61 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = subdir-objects 1.12
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -Wall,no-override
 
 AM_CFLAGS = \
+       $(AC_CFLAGS) \
        $(LIBYANG_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNWIND_CFLAGS) \
        $(SAN_FLAGS) \
        $(WERROR) \
        # end
-AM_CPPFLAGS = \
+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
+# assert() overridden
+CPPFLAGS_BASE = \
        -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) \
        $(LUA_INCLUDE) \
        # end
+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@
@@ -95,8 +131,6 @@ CLEANFILES =
 DISTCLEANFILES =
 SUFFIXES =
 
-examplesdir = $(exampledir)
-
 bin_PROGRAMS =
 sbin_PROGRAMS =
 sbin_SCRIPTS =
@@ -108,10 +142,8 @@ lib_LTLIBRARIES =
 module_LTLIBRARIES =
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
-dist_examples_DATA =
 dist_yangmodels_DATA =
 man_MANS =
-vtysh_scan =
 vtysh_daemons =
 clippy_scan =
 
@@ -158,6 +190,8 @@ include bfdd/subdir.am
 include yang/subdir.am
 include yang/libyang_plugins/subdir.am
 include vrrpd/subdir.am
+include pceplib/subdir.am
+include pceplib/test/subdir.am
 include pathd/subdir.am
 
 include vtysh/subdir.am
@@ -182,8 +216,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 \
@@ -193,12 +225,13 @@ EXTRA_DIST += \
        python/makefile.py \
        python/tiabwarfo.py \
        python/xrelfo.py \
+       python/xref2vtysh.py \
        python/test_xrelfo.py \
        python/runtests.py \
        \
        python/xrefstructs.json \
        \
-       redhat/frr.logrotate \
+       tools/etc/logrotate.d/frr \
        redhat/frr.pam \
        redhat/frr.spec \
        \