X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=0750910736ed0fb67219d7b2f768e90974dcc59b;hb=847a0730a03f0fb4461c79ae957eabe03db71f53;hp=5cc4e0fe46116398294d1411eb44e6fc614bab3b;hpb=c83cdd307248d798eac0d85681b0abeaaff1bf61;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index 5cc4e0fe..07509107 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -14,8 +14,11 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/backtrace.h \
 	lib/bitmap.c \
 	lib/bitmap.h \
+	lib/byte-order.h \
 	lib/byteq.c \
 	lib/byteq.h \
+	lib/cfm.c \
+	lib/cfm.h \
 	lib/classifier.c \
 	lib/classifier.h \
 	lib/command-line.c \
@@ -28,6 +31,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/csum.h \
 	lib/daemon.c \
 	lib/daemon.h \
+	lib/dummy.c \
+	lib/dummy.h \
 	lib/dhcp-client.c \
 	lib/dhcp-client.h \
 	lib/dhcp.c \
@@ -40,6 +45,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 \
@@ -62,13 +69,21 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/lockfile.h \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
+	lib/netdev-dummy.c \
 	lib/netdev-provider.h \
 	lib/netdev.c \
 	lib/netdev.h \
+	lib/nx-match.c \
+	lib/nx-match.def \
+	lib/nx-match.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 \
+	lib/ofp-util.h \
 	lib/ofpbuf.c \
 	lib/ofpbuf.h \
 	lib/ovsdb-data.c \
@@ -111,8 +126,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 \
@@ -145,8 +158,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
@@ -164,13 +176,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 \
@@ -196,7 +209,7 @@ EXTRA_DIST += \
 	lib/dh1024.pem \
 	lib/dh2048.pem \
 	lib/dh4096.pem \
-	lib/dhparams.h
+	lib/dirs.c.in
 
 EXTRA_DIST += \
 	lib/common.man \
@@ -218,16 +231,18 @@ EXTRA_DIST += \
 	lib/vlog-syn.man \
 	lib/vlog.man
 
-
-lib/dirs.c: Makefile
-	($(ro_c) && \
-	 echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \
-	 echo 'const char ovs_rundir[] = "@RUNDIR@";' && \
-	 echo 'const char ovs_logdir[] = "@LOGDIR@";' && \
-	 echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp
+lib/dirs.c: lib/dirs.c.in Makefile
+	($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
+		-e 's,[@]srcdir[@],$(srcdir),g' \
+		-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
+		-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
+		-e 's,[@]bindir[@],"$(bindir)",g' \
+		-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
+	     > 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)
@@ -248,6 +263,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 \
@@ -260,3 +276,9 @@ lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
 	(cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
 	mv $@.tmp $@
 EXTRA_DIST += lib/coverage-scan.pl
+
+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