X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=51d3c11bff8b7576c372fa165d63f35dc4ee68c7;hb=246e61ea75df598de1ef11130ca32407196dd736;hp=7e70822af9eba6e0e3d41c0f051567f0af18f5d9;hpb=dd18a8a4e6a40cfc575248b86a47ce4071915040;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index 7e70822af..51d3c11bf 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010 Nicira Networks, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -16,8 +16,6 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/bitmap.h \
 	lib/byteq.c \
 	lib/byteq.h \
-	lib/cfg.c \
-	lib/cfg.h \
 	lib/classifier.c \
 	lib/classifier.h \
 	lib/command-line.c \
@@ -45,8 +43,6 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/dynamic-string.h \
 	lib/fatal-signal.c \
 	lib/fatal-signal.h \
-	lib/fault.c \
-	lib/fault.h \
 	lib/flow.c \
 	lib/flow.h \
 	lib/hash.c \
@@ -81,6 +77,9 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/ovsdb-data.h \
 	lib/ovsdb-error.c \
 	lib/ovsdb-error.h \
+	lib/ovsdb-idl-provider.h \
+	lib/ovsdb-idl.c \
+	lib/ovsdb-idl.h \
 	lib/ovsdb-parser.c \
 	lib/ovsdb-parser.h \
 	lib/ovsdb-types.c \
@@ -101,6 +100,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/random.h \
 	lib/rconn.c \
 	lib/rconn.h \
+	lib/reconnect.c \
+	lib/reconnect.h \
 	lib/rtnetlink.c \
 	lib/rtnetlink.h \
 	lib/sat-math.h \
@@ -119,10 +120,12 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
+	lib/stream-ssl.h \
 	lib/stream-tcp.c \
 	lib/stream-unix.c \
 	lib/stream.c \
 	lib/stream.h \
+	lib/string.h \
 	lib/svec.c \
 	lib/svec.h \
 	lib/tag.c \
@@ -130,21 +133,17 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/timeval.c \
 	lib/timeval.h \
 	lib/type-props.h \
-	lib/uuid.c \
-	lib/uuid.h \
-	lib/unixctl.c \
-	lib/unixctl.h \
 	lib/unicode.c \
 	lib/unicode.h \
+	lib/unixctl.c \
+	lib/unixctl.h \
 	lib/util.c \
 	lib/util.h \
+	lib/uuid.c \
+	lib/uuid.h \
 	lib/valgrind.h \
 	lib/vconn-provider.h \
-	lib/vconn-ssl.h \
 	lib/vconn-stream.c \
-	lib/vconn-stream.h \
-	lib/vconn-tcp.c \
-	lib/vconn-unix.c \
 	lib/vconn.c \
 	lib/vconn.h \
 	lib/vlog-modules.def \
@@ -156,6 +155,19 @@ nodist_lib_libopenvswitch_a_SOURCES = \
 	lib/dirs.c
 CLEANFILES += $(nodist_lib_libopenvswitch_a_SOURCES)
 
+noinst_LIBRARIES += lib/libsflow.a
+lib_libsflow_a_SOURCES = \
+	lib/sflow_api.h \
+	lib/sflow.h \
+	lib/sflow_agent.c \
+	lib/sflow_sampler.c \
+	lib/sflow_poller.c \
+	lib/sflow_receiver.c
+lib_libsflow_a_CFLAGS = $(AM_CFLAGS)
+if HAVE_WNO_UNUSED
+lib_libsflow_a_CFLAGS += -Wno-unused
+endif
+
 if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
 	lib/netlink-protocol.h \
@@ -164,8 +176,7 @@ lib_libopenvswitch_a_SOURCES += \
 endif
 
 if HAVE_OPENSSL
-lib_libopenvswitch_a_SOURCES += \
-	lib/vconn-ssl.c 
+lib_libopenvswitch_a_SOURCES += lib/stream-ssl.c
 nodist_lib_libopenvswitch_a_SOURCES += lib/dhparams.c
 lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
 	(echo '#include "lib/dhparams.h"' &&				\
@@ -184,10 +195,20 @@ EXTRA_DIST += \
 
 EXTRA_DIST += \
 	lib/common.man \
+	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/vconn-active.man \
+	lib/vconn-passive.man \
 	lib/vlog-unixctl.man \
+	lib/vlog-syn.man \
 	lib/vlog.man
 
 
@@ -227,7 +248,6 @@ COVERAGE_FILES = \
 	ofproto/ofproto.c \
 	ofproto/pktbuf.c \
 	vswitchd/bridge.c \
-	vswitchd/mgmt.c \
 	vswitchd/ovs-brcompatd.c
 lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
 	(cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp