X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=6554b44a0bcb509c5a4b85bc49cd84add79c2fbf;hb=836fad5e1ae4316752150fcdfba9afbf8d5f5801;hp=c8b07c96fbf3c602536b49b7d6197520531831de;hpb=9467fe624698a9b72f81bb1ddfce33a5fc85281c;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index c8b07c96..6554b44a 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
@@ -43,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 \
@@ -65,6 +63,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/lockfile.h \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
+	lib/netdev-gre.c \
 	lib/netdev-linux.c \
 	lib/netdev-provider.h \
 	lib/netdev.c \
@@ -127,6 +126,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/stream-unix.c \
 	lib/stream.c \
 	lib/stream.h \
+	lib/string.h \
 	lib/svec.c \
 	lib/svec.h \
 	lib/tag.c \
@@ -144,11 +144,7 @@ lib_libopenvswitch_a_SOURCES = \
 	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 \
@@ -160,6 +156,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 \
@@ -168,9 +177,7 @@ lib_libopenvswitch_a_SOURCES += \
 endif
 
 if HAVE_OPENSSL
-lib_libopenvswitch_a_SOURCES += \
-	lib/stream-ssl.c \
-	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"' &&				\
@@ -199,6 +206,8 @@ EXTRA_DIST += \
 	lib/ssl-peer-ca-cert.man \
 	lib/ssl.man \
 	lib/ssl-syn.man \
+	lib/unixctl.man \
+	lib/unixctl-syn.man \
 	lib/vconn-active.man \
 	lib/vconn-passive.man \
 	lib/vlog-unixctl.man \