Merge "sflow" into "master".

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index d129491..67100fc 100644 (file)
--- 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
@@ -58,7 +58,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/mac-learning.c \
        lib/mac-learning.h \
        lib/netdev-linux.c \
-       lib/netdev-linux.h \
+       lib/netdev-provider.h \
        lib/netdev.c \
        lib/netdev.h \
        lib/odp-util.c \
@@ -67,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 \
@@ -82,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 \
@@ -93,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 \
@@ -122,6 +126,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 \
@@ -153,6 +170,7 @@ EXTRA_DIST += \
        lib/daemon.man \
        lib/dpif.man \
        lib/leak-checker.man \
+       lib/vlog-unixctl.man \
        lib/vlog.man
 
 
@@ -183,6 +201,7 @@ COVERAGE_FILES = \
        lib/poll-loop.c \
        lib/process.c \
        lib/rconn.c \
+       lib/rtnetlink.c \
        lib/timeval.c \
        lib/unixctl.c \
        lib/util.c \