datapath: Fix build with backported netdev_alloc_skb_ip_align()

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 046e9ab..49f4e2c 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -67,6 +67,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/netdev.h \
        lib/odp-util.c \
        lib/odp-util.h \
+       lib/ofp-parse.c \
+       lib/ofp-parse.h \
        lib/ofp-print.c \
        lib/ofp-print.h \
        lib/ofp-util.c \
@@ -166,6 +168,9 @@ lib_libsflow_a_CFLAGS = $(AM_CFLAGS)
 if HAVE_WNO_UNUSED
 lib_libsflow_a_CFLAGS += -Wno-unused
 endif
+if HAVE_WNO_UNUSED_PARAMETER
+lib_libsflow_a_CFLAGS += -Wno-unused-parameter
+endif
 
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
@@ -263,30 +268,8 @@ lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
        mv $@.tmp $@
 EXTRA_DIST += lib/coverage-scan.pl
 
-
-# Make sure that every vlog module listed in vlog-modules.def is
-# actually used somewhere.
-ALL_LOCAL += check-for-unused-vlog-modules
-check-for-unused-vlog-modules:
-       if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then    \
-         cd $(srcdir);                                                       \
-         decl_vlog=`sed -n 's/^VLOG_MODULE(\([_a-z0-9]\{1,\}\)).*$$/\1/p'    \
-                    lib/vlog-modules.def |                                   \
-                     LC_ALL=C sort -u |                                              \
-                     xargs echo`;                                            \
-         used_vlog=`git grep VLOG_DEFINE_THIS_MODULE |                       \
-                    sed -n 's/.*VLOG_DEFINE_THIS_MODULE(\([a-z_0-9]\{1,\}\)).*/\1/p' |       \
-                    LC_ALL=C sort -u |                                       \
-                     xargs echo`;                                            \
-         rc=0;                                                               \
-         for decl in $$decl_vlog; do                                         \
-            case " $$used_vlog " in                                          \
-             *" $$decl "*) ;;                                                \
-             *) echo "vlog module $$decl is declared in lib/vlog-modules.def \
-but not used by any source file";                                            \
-                 rc=1 ;;                                                     \
-            esac                                                             \
-          done;                                                                      \
-         exit $$rc;                                                          \
-       fi
-.PHONY: check-for-unused-vlog-modules
+ALL_LOCAL += check-vlog-modules
+check-vlog-modules:
+       cd $(srcdir) && build-aux/check-vlog-modules
+.PHONY: check-vlog-modules
+EXTRA_DIST += build-aux/check-vlog-modules