X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=4e2fcf3bcb362adfd7316b6177337eaadd9b5609;hb=b5d29991cc4722aec39c346c3f82291581e92aa0;hp=efc1fd7b0fe9f8ab374712453ca676f2c111c749;hpb=bf8f2167fd3107f5513d487a69a6568cf51afd68;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index efc1fd7b..4e2fcf3b 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -18,6 +18,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/bitmap.h \
 	lib/bond.c \
 	lib/bond.h \
+	lib/bundle.c \
+	lib/bundle.h \
 	lib/byte-order.h \
 	lib/byteq.c \
 	lib/byteq.h \
@@ -55,6 +57,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/hash.h \
 	lib/hmap.c \
 	lib/hmap.h \
+	lib/hmapx.c \
+	lib/hmapx.h \
 	lib/json.c \
 	lib/json.h \
 	lib/jsonrpc.c \
@@ -63,6 +67,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/lacp.h \
 	lib/leak-checker.c \
 	lib/leak-checker.h \
+	lib/learn.c \
+	lib/learn.h \
 	lib/learning-switch.c \
 	lib/learning-switch.h \
 	lib/list.c \
@@ -71,16 +77,18 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/lockfile.h \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
+	lib/meta-flow.c \
+	lib/meta-flow.h \
 	lib/multipath.c \
 	lib/multipath.h \
 	lib/netdev-dummy.c \
 	lib/netdev-provider.h \
 	lib/netdev.c \
 	lib/netdev.h \
+	lib/netflow.h \
 	lib/netlink.c \
 	lib/netlink.h \
 	lib/nx-match.c \
-	lib/nx-match.def \
 	lib/nx-match.h \
 	lib/odp-util.c \
 	lib/odp-util.h \
@@ -91,6 +99,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/ofp-print.c \
 	lib/ofp-print.h \
 	lib/ofp-util.c \
+	lib/ofp-util.def \
 	lib/ofp-util.h \
 	lib/ofpbuf.c \
 	lib/ofpbuf.h \
@@ -132,6 +141,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/sort.h \
 	lib/sset.c \
 	lib/sset.h \
+	lib/stp.c \
+	lib/stp.h \
 	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
@@ -169,6 +180,10 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vconn-stream.c \
 	lib/vconn.c \
 	lib/vconn.h \
+	lib/vlan-bitmap.c \
+	lib/vlan-bitmap.h \
+	lib/vlandev.c \
+	lib/vlandev.h \
 	lib/vlog.c \
 	lib/vlog.h
 nodist_lib_libopenvswitch_a_SOURCES = \
@@ -199,11 +214,11 @@ lib_libopenvswitch_a_SOURCES += \
 	lib/netdev-linux.h \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
+	lib/netlink-notifier.c \
+	lib/netlink-notifier.h \
 	lib/netlink-protocol.h \
 	lib/netlink-socket.c \
 	lib/netlink-socket.h \
-	lib/rtnetlink.c \
-	lib/rtnetlink.h \
 	lib/rtnetlink-link.c \
 	lib/rtnetlink-link.h \
 	lib/route-table.c \
@@ -230,12 +245,13 @@ EXTRA_DIST += \
 	lib/dh4096.pem \
 	lib/dirs.c.in
 
-EXTRA_DIST += \
+MAN_FRAGMENTS += \
 	lib/common.man \
 	lib/common-syn.man \
 	lib/daemon.man \
 	lib/daemon-syn.man \
 	lib/leak-checker.man \
+	lib/ovs.tmac \
 	lib/ssl-bootstrap.man \
 	lib/ssl-bootstrap-syn.man \
 	lib/ssl-peer-ca-cert.man \
@@ -257,19 +273,19 @@ lib/dirs.c: lib/dirs.c.in Makefile
 		-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
 		-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
 		-e 's,[@]bindir[@],"$(bindir)",g' \
+		-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
 		-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
 	     > lib/dirs.c.tmp
 	mv lib/dirs.c.tmp lib/dirs.c
 
-$(srcdir)/lib/ofp-errors.c: \
-	include/openflow/openflow.h include/openflow/nicira-ext.h \
-	build-aux/extract-ofp-errors
-	cd $(srcdir)/include && \
-	$(PYTHON) ../build-aux/extract-ofp-errors \
-		openflow/openflow.h openflow/nicira-ext.h > ../lib/ofp-errors.c
-EXTRA_DIST += build-aux/extract-ofp-errors
+$(srcdir)/lib/ofp-errors.inc: \
+	lib/ofp-errors.h $(srcdir)/build-aux/extract-ofp-errors
+	$(PYTHON) $(srcdir)/build-aux/extract-ofp-errors \
+		$(srcdir)/lib/ofp-errors.h > $@.tmp && mv $@.tmp $@
+lib/ofp-errors.c: lib/ofp-errors.inc
+EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
 
-install-data-local: lib-install-data-local
+INSTALL_DATA_LOCAL += lib-install-data-local
 lib-install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(RUNDIR)
 	$(MKDIR_P) $(DESTDIR)$(PKIDIR)