X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=5cfac240060e306ad4c5656c5e657a9ef5c642bc;hb=faa50f408b92163e21e19d69589728d5c0ebcb70;hp=046e9ab6e56115e853ce098b6bfc011da1874974;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index 046e9ab6..5cfac240 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -14,6 +14,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/backtrace.h \
 	lib/bitmap.c \
 	lib/bitmap.h \
+	lib/byte-order.h \
 	lib/byteq.c \
 	lib/byteq.h \
 	lib/classifier.c \
@@ -40,6 +41,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/dpif.h \
 	lib/dynamic-string.c \
 	lib/dynamic-string.h \
+	lib/entropy.c \
+	lib/entropy.h \
 	lib/fatal-signal.c \
 	lib/fatal-signal.h \
 	lib/flow.c \
@@ -67,6 +70,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 \
@@ -113,8 +118,6 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/socket-util.h \
 	lib/sort.c \
 	lib/sort.h \
-	lib/stp.c \
-	lib/stp.h \
 	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
@@ -147,8 +150,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vconn.h \
 	lib/vlog-modules.def \
 	lib/vlog.c \
-	lib/vlog.h \
-	lib/xtoxll.h
+	lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
 	lib/coverage-counters.c \
 	lib/dirs.c
@@ -166,13 +168,14 @@ 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 += \
 	lib/dpif-linux.c \
-	lib/netdev-gre.c \
 	lib/netdev-linux.c \
-	lib/netdev-patch.c \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
 	lib/netlink-protocol.h \
@@ -229,7 +232,8 @@ lib/dirs.c: Makefile
 	 echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp
 	mv lib/dirs.c.tmp lib/dirs.c
 
-install-data-local:
+install-data-local: lib-install-data-local
+lib-install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(RUNDIR)
 	$(MKDIR_P) $(DESTDIR)$(PKIDIR)
 	$(MKDIR_P) $(DESTDIR)$(LOGDIR)
@@ -250,6 +254,7 @@ COVERAGE_FILES = \
 	lib/rconn.c \
 	lib/rtnetlink.c \
 	lib/stream.c \
+	lib/stream-ssl.c \
 	lib/timeval.c \
 	lib/unixctl.c \
 	lib/util.c \
@@ -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