X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=5da1971e42bd718c230121ee0a05476ed4034cf0;hb=0574f71b4b6820cecb8247a6e0269606c8ef2edf;hp=91d8fff24c0af2030d1999e619c0ade0f9686b5f;hpb=d76f09ea77e03ee5a3a7bb67bcab1ac4bb54172b;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index 91d8fff2..5da1971e 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
@@ -68,15 +68,21 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/lockfile.h \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
+	lib/multipath.c \
+	lib/multipath.h \
 	lib/netdev-dummy.c \
 	lib/netdev-provider.h \
 	lib/netdev.c \
 	lib/netdev.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 \
+	lib/ofp-errors.c \
+	lib/ofp-errors.h \
 	lib/ofp-parse.c \
 	lib/ofp-parse.h \
 	lib/ofp-print.c \
@@ -102,12 +108,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/pcap.h \
 	lib/poll-loop.c \
 	lib/poll-loop.h \
-	lib/port-array.c \
-	lib/port-array.h \
 	lib/process.c \
 	lib/process.h \
-	lib/queue.c \
-	lib/queue.h \
 	lib/random.c \
 	lib/random.h \
 	lib/rconn.c \
@@ -133,9 +135,14 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream-unix.c \
 	lib/stream.c \
 	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 \
@@ -180,14 +187,19 @@ 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 \
 	lib/netlink-protocol.h \
-	lib/netlink.c \
-	lib/netlink.h \
+	lib/netlink-socket.c \
+	lib/netlink-socket.h \
 	lib/rtnetlink.c \
-	lib/rtnetlink.h
+	lib/rtnetlink.h \
+	lib/rtnetlink-link.c \
+	lib/rtnetlink-link.h \
+	lib/route-table.c \
+	lib/route-table.h
 endif
 
 if HAVE_OPENSSL
@@ -213,13 +225,14 @@ 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 \
 	lib/ssl-peer-ca-cert.man \
 	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 \
@@ -238,6 +251,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)
@@ -261,6 +282,11 @@ lib/coverage.def: $(DIST_SOURCES)
 	sed -n 's|^COVERAGE_DEFINE(\([_a-zA-Z0-9]\{1,\}\)).*$$|COVERAGE_COUNTER(\1)|p' $(all_sources) | LC_ALL=C sort -u > $@
 CLEANFILES += lib/coverage.def
 
+lib/stress.$(OBJEXT): lib/stress.def
+lib/stress.def: $(DIST_SOURCES)
+	sed -n '/^STRESS_OPTION(/,/);$$/{s/);$$/)/;p}' $(all_sources) > $@
+CLEANFILES += lib/stress.def
+
 lib/vlog.$(OBJEXT): lib/vlog-modules.def
 lib/vlog-modules.def: $(DIST_SOURCES)
 	sed -n 's|^VLOG_DEFINE_\(THIS_\)\{0,1\}MODULE(\([_a-zA-Z0-9]\{1,\}\)).*$$|VLOG_MODULE(\2)|p' $(all_sources) | LC_ALL=C sort -u > $@