Merge pull request #8593 from idryzhov/cmd-ambiguous

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0dff83e505a2a6f10341f5029310af831c6aa1a4..a38029dcfa537ad2ef3fb7ba60c4007ec582f9f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,34 @@
 ## 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 = \
        -export-dynamic \
        $(AC_LDFLAGS) \