X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=297e89c452d6ca378dc424b6232b55f64867296b;hb=1c2e2d2fc87c9435b6fe33112b0ddaab59f507c5;hp=f5d23a23b116d8328b9cded62c028557eb93b39d;hpb=ea83a2fcd0d31246ece7bdea4c54e162f432e81c;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index f5d23a23..297e89c4 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -30,12 +30,9 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/csum.h \
 	lib/daemon.c \
 	lib/daemon.h \
+	lib/dhcp.h \
 	lib/dummy.c \
 	lib/dummy.h \
-	lib/dhcp-client.c \
-	lib/dhcp-client.h \
-	lib/dhcp.c \
-	lib/dhcp.h \
 	lib/dhparams.h \
 	lib/dirs.h \
 	lib/dpif-netdev.c \
@@ -58,6 +55,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/json.h \
 	lib/jsonrpc.c \
 	lib/jsonrpc.h \
+	lib/lacp.c \
+	lib/lacp.h \
 	lib/leak-checker.c \
 	lib/leak-checker.h \
 	lib/learning-switch.c \
@@ -81,6 +80,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/nx-match.h \
 	lib/odp-util.c \
 	lib/odp-util.h \
+	lib/ofp-errors.c \
+	lib/ofp-errors.h \
 	lib/ofp-parse.c \
 	lib/ofp-parse.h \
 	lib/ofp-print.c \
@@ -135,9 +136,12 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream.h \
 	lib/stress.c \
 	lib/stress.h \
+	lib/string.c \
 	lib/string.h \
 	lib/svec.c \
 	lib/svec.h \
+	lib/table.c \
+	lib/table.h \
 	lib/tag.c \
 	lib/tag.h \
 	lib/timeval.c \
@@ -182,6 +186,7 @@ endif
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
 	lib/dpif-linux.c \
+	lib/dpif-linux.h \
 	lib/netdev-linux.c \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
@@ -192,8 +197,8 @@ lib_libopenvswitch_a_SOURCES += \
 	lib/rtnetlink.h \
 	lib/rtnetlink-link.c \
 	lib/rtnetlink-link.h \
-	lib/rtnetlink-route.c \
-	lib/rtnetlink-route.h
+	lib/route-table.c \
+	lib/route-table.h
 endif
 
 if HAVE_OPENSSL
@@ -219,7 +224,6 @@ EXTRA_DIST += \
 	lib/common-syn.man \
 	lib/daemon.man \
 	lib/daemon-syn.man \
-	lib/dpif.man \
 	lib/leak-checker.man \
 	lib/ssl-bootstrap.man \
 	lib/ssl-bootstrap-syn.man \
@@ -227,6 +231,7 @@ EXTRA_DIST += \
 	lib/ssl.man \
 	lib/ssl-syn.man \
 	lib/stress-unixctl.man \
+	lib/table.man \
 	lib/unixctl.man \
 	lib/unixctl-syn.man \
 	lib/vconn-active.man \
@@ -245,6 +250,14 @@ lib/dirs.c: lib/dirs.c.in Makefile
 	     > 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
+
 install-data-local: lib-install-data-local
 lib-install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(RUNDIR)