projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlog: Make the vlog module catalog program-specific.
[openvswitch]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index f216b3fb795bd6cc86ffa26bfebb0063fbe3f70a..3bf9da1ce5a8c45f1ee078078d7a72cd32bba6ab 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
#
# 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/bitmap.h \
lib/byteq.c \
lib/byteq.h \
- lib/cfg.c \
- lib/cfg.h \
lib/classifier.c \
lib/classifier.h \
lib/command-line.c \
lib/classifier.c \
lib/classifier.h \
lib/command-line.c \
@@
-36,7
+34,6
@@
lib_libopenvswitch_a_SOURCES = \
lib/dhcp.h \
lib/dhparams.h \
lib/dirs.h \
lib/dhcp.h \
lib/dhparams.h \
lib/dirs.h \
- lib/dpif-linux.c \
lib/dpif-netdev.c \
lib/dpif-provider.h \
lib/dpif.c \
lib/dpif-netdev.c \
lib/dpif-provider.h \
lib/dpif.c \
@@
-45,8
+42,6
@@
lib_libopenvswitch_a_SOURCES = \
lib/dynamic-string.h \
lib/fatal-signal.c \
lib/fatal-signal.h \
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 \
lib/flow.c \
lib/flow.h \
lib/hash.c \
@@
-67,7
+62,6
@@
lib_libopenvswitch_a_SOURCES = \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
- lib/netdev-linux.c \
lib/netdev-provider.h \
lib/netdev.c \
lib/netdev.h \
lib/netdev-provider.h \
lib/netdev.c \
lib/netdev.h \
@@
-75,6
+69,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/odp-util.h \
lib/ofp-print.c \
lib/ofp-print.h \
lib/odp-util.h \
lib/ofp-print.c \
lib/ofp-print.h \
+ lib/ofp-util.c \
+ lib/ofp-util.h \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovsdb-data.c \
lib/ofpbuf.c \
lib/ofpbuf.h \
lib/ovsdb-data.c \
@@
-106,8
+102,6
@@
lib_libopenvswitch_a_SOURCES = \
lib/rconn.h \
lib/reconnect.c \
lib/reconnect.h \
lib/rconn.h \
lib/reconnect.c \
lib/reconnect.h \
- lib/rtnetlink.c \
- lib/rtnetlink.h \
lib/sat-math.h \
lib/sha1.c \
lib/sha1.h \
lib/sat-math.h \
lib/sha1.c \
lib/sha1.h \
@@
-124,10
+118,12
@@
lib_libopenvswitch_a_SOURCES = \
lib/stream-fd.c \
lib/stream-fd.h \
lib/stream-provider.h \
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/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 \
lib/svec.c \
lib/svec.h \
lib/tag.c \
@@
-135,21
+131,18
@@
lib_libopenvswitch_a_SOURCES = \
lib/timeval.c \
lib/timeval.h \
lib/type-props.h \
lib/timeval.c \
lib/timeval.h \
lib/type-props.h \
- lib/uuid.c \
- lib/uuid.h \
- lib/unixctl.c \
- lib/unixctl.h \
+ lib/unaligned.h \
lib/unicode.c \
lib/unicode.h \
lib/unicode.c \
lib/unicode.h \
+ lib/unixctl.c \
+ lib/unixctl.h \
lib/util.c \
lib/util.h \
lib/util.c \
lib/util.h \
+ lib/uuid.c \
+ lib/uuid.h \
lib/valgrind.h \
lib/vconn-provider.h \
lib/valgrind.h \
lib/vconn-provider.h \
- lib/vconn-ssl.h \
lib/vconn-stream.c \
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 \
lib/vconn.c \
lib/vconn.h \
lib/vlog-modules.def \
@@
-161,16
+154,36
@@
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
CLEANFILES += $(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 += \
if HAVE_NETLINK
lib_libopenvswitch_a_SOURCES += \
+ lib/dpif-linux.c \
+ lib/netdev-gre.c \
+ lib/netdev-linux.c \
+ lib/netdev-patch.c \
+ lib/netdev-vport.c \
+ lib/netdev-vport.h \
lib/netlink-protocol.h \
lib/netlink.c \
lib/netlink-protocol.h \
lib/netlink.c \
- lib/netlink.h
+ lib/netlink.h \
+ lib/rtnetlink.c \
+ lib/rtnetlink.h
endif
if HAVE_OPENSSL
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"' && \
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"' && \
@@
-194,6
+207,15
@@
EXTRA_DIST += \
lib/daemon-syn.man \
lib/dpif.man \
lib/leak-checker.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/unixctl.man \
+ lib/unixctl-syn.man \
+ lib/vconn-active.man \
+ lib/vconn-passive.man \
lib/vlog-unixctl.man \
lib/vlog-syn.man \
lib/vlog.man
lib/vlog-unixctl.man \
lib/vlog-syn.man \
lib/vlog.man
@@
-240,3
+262,9
@@
lib/coverage-counters.c: $(COVERAGE_FILES) lib/coverage-scan.pl
(cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
mv $@.tmp $@
EXTRA_DIST += lib/coverage-scan.pl
(cd $(srcdir) && $(PERL) lib/coverage-scan.pl $(COVERAGE_FILES)) > $@.tmp
mv $@.tmp $@
EXTRA_DIST += lib/coverage-scan.pl
+
+ALL_LOCAL += check-vlog-modules
+check-vlog-modules:
+ cd $(srcdir) && build-aux/check-vlog-modules
+.PHONY: check-vlog-modules
+EXTRA_DIST += build-aux/check-vlog-modules