X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fautomake.mk;h=67100fc1852bf231a783f3101dff858042229f3e;hb=2175540274b68b10a9368e2c751f79e6d387baed;hp=4d2924b6394b4d5f7d06ec7b0f20c56cd6cfc512;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/lib/automake.mk b/lib/automake.mk
index 4d2924b6..67100fc1 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,3 +1,10 @@
+# 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
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.
+
 noinst_LIBRARIES += lib/libopenvswitch.a
 
 lib_libopenvswitch_a_SOURCES = \
@@ -14,7 +21,6 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/compiler.h \
 	lib/coverage.c \
 	lib/coverage.h \
-	lib/coverage-counters.c \
 	lib/coverage-counters.h \
 	lib/csum.c \
 	lib/csum.h \
@@ -25,8 +31,12 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/dhcp.c \
 	lib/dhcp.h \
 	lib/dhparams.h \
-	lib/dirs.c \
 	lib/dirs.h \
+	lib/dpif-linux.c \
+	lib/dpif-netdev.c \
+	lib/dpif-provider.h \
+	lib/dpif.c \
+	lib/dpif.h \
 	lib/dynamic-string.c \
 	lib/dynamic-string.h \
 	lib/fatal-signal.c \
@@ -47,6 +57,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/list.h \
 	lib/mac-learning.c \
 	lib/mac-learning.h \
+	lib/netdev-linux.c \
+	lib/netdev-provider.h \
 	lib/netdev.c \
 	lib/netdev.h \
 	lib/odp-util.c \
@@ -55,6 +67,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/ofp-print.h \
 	lib/ofpbuf.c \
 	lib/ofpbuf.h \
+	lib/packets.c \
 	lib/packets.h \
 	lib/pcap.c \
 	lib/pcap.h \
@@ -70,6 +83,8 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/random.h \
 	lib/rconn.c \
 	lib/rconn.h \
+	lib/rtnetlink.c \
+	lib/rtnetlink.h \
 	lib/sat-math.h \
 	lib/sha1.c \
 	lib/sha1.h \
@@ -81,6 +96,7 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/socket-util.h \
 	lib/stp.c \
 	lib/stp.h \
+	lib/string.h \
 	lib/svec.c \
 	lib/svec.h \
 	lib/tag.c \
@@ -105,11 +121,26 @@ lib_libopenvswitch_a_SOURCES = \
 	lib/vlog.c \
 	lib/vlog.h \
 	lib/xtoxll.h
+nodist_lib_libopenvswitch_a_SOURCES = \
+	lib/coverage-counters.c \
+	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/dpif.c \
-	lib/dpif.h \
 	lib/netlink-protocol.h \
 	lib/netlink.c \
 	lib/netlink.h
@@ -118,7 +149,7 @@ endif
 if HAVE_OPENSSL
 lib_libopenvswitch_a_SOURCES += \
 	lib/vconn-ssl.c 
-nodist_lib_libopenvswitch_a_SOURCES = lib/dhparams.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"' &&				\
 	 openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout &&	\
@@ -139,10 +170,10 @@ EXTRA_DIST += \
 	lib/daemon.man \
 	lib/dpif.man \
 	lib/leak-checker.man \
+	lib/vlog-unixctl.man \
 	lib/vlog.man
 
 
-CLEANFILES += lib/dirs.c
 lib/dirs.c: Makefile
 	($(ro_c) && \
 	 echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \
@@ -164,17 +195,19 @@ COVERAGE_FILES = \
 	lib/hmap.c \
 	lib/mac-learning.c \
 	lib/netdev.c \
+	lib/netdev-linux.c \
 	lib/netlink.c \
 	lib/odp-util.c \
 	lib/poll-loop.c \
 	lib/process.c \
 	lib/rconn.c \
+	lib/rtnetlink.c \
 	lib/timeval.c \
 	lib/unixctl.c \
 	lib/util.c \
 	lib/vconn.c \
-	secchan/ofproto.c \
-	secchan/pktbuf.c \
+	ofproto/ofproto.c \
+	ofproto/pktbuf.c \
 	vswitchd/bridge.c \
 	vswitchd/mgmt.c \
 	vswitchd/ovs-brcompatd.c