Merge pull request #2489 from pacovn/cppcheck_reduntant_pointer_op

[mirror_frr.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3b8deb5884e364228a780f36b5afbf034127dff5..5dc80b4983d57969e9f1f4d1042ed9dc1c406b25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,8 @@
 AUTOMAKE_OPTIONS = subdir-objects 1.12
 include common.am
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
+AM_CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
              -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib
-AM_CFLAGS = $(WERROR)
 VERSION_TYPE := $(shell if echo $(VERSION) | grep -q '^[0-9\.]*$$'; then echo RELEASE ; else echo DEV ; fi)
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DCONFDATE=$(CONFDATE) -DVERSION_TYPE_$(VERSION_TYPE)
 LIBCAP = @LIBCAP@
@@ -83,9 +82,7 @@ rc_SCRIPTS = \
 endif
 
 EXTRA_DIST += \
-       SERVICES \
        aclocal.m4 \
-       update-autotools \
        m4/README.txt \
        \
        python/clidef.py \