X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=31af3c9dfd2a4bb52693a2ef5f17901537a51f7c;hb=09246b99d1601e2ba7ff85bb26f9b0235632a76d;hp=1d02dfd4948d4d34f78aaa673112c8bddc52da44;hpb=d918d9d1128a98e4b2a398a501f541554fed3be8;p=sliver-openvswitch.git diff --git a/lib/automake.mk b/lib/automake.mk index 1d02dfd49..31af3c9df 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 @@ -14,8 +14,9 @@ lib_libopenvswitch_a_SOURCES = \ lib/backtrace.h \ lib/bitmap.c \ lib/bitmap.h \ - lib/cfg.c \ - lib/cfg.h \ + lib/byte-order.h \ + lib/byteq.c \ + lib/byteq.h \ lib/classifier.c \ lib/classifier.h \ lib/command-line.c \ @@ -34,17 +35,16 @@ lib_libopenvswitch_a_SOURCES = \ 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.h \ lib/dynamic-string.c \ lib/dynamic-string.h \ + lib/entropy.c \ + lib/entropy.h \ lib/fatal-signal.c \ lib/fatal-signal.h \ - lib/fault.c \ - lib/fault.h \ lib/flow.c \ lib/flow.h \ lib/hash.c \ @@ -53,6 +53,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/hmap.h \ lib/json.c \ lib/json.h \ + lib/jsonrpc.c \ + lib/jsonrpc.h \ lib/leak-checker.c \ lib/leak-checker.h \ lib/learning-switch.c \ @@ -63,16 +65,32 @@ lib_libopenvswitch_a_SOURCES = \ 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/nx-match.c \ + lib/nx-match.h \ lib/odp-util.c \ lib/odp-util.h \ + lib/ofp-parse.c \ + lib/ofp-parse.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/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 \ + lib/ovsdb-types.h \ lib/packets.c \ lib/packets.h \ lib/pcap.c \ @@ -89,8 +107,8 @@ lib_libopenvswitch_a_SOURCES = \ lib/random.h \ lib/rconn.c \ lib/rconn.h \ - lib/rtnetlink.c \ - lib/rtnetlink.h \ + lib/reconnect.c \ + lib/reconnect.h \ lib/sat-math.h \ lib/sha1.c \ lib/sha1.h \ @@ -100,8 +118,17 @@ lib_libopenvswitch_a_SOURCES = \ lib/signals.h \ lib/socket-util.c \ lib/socket-util.h \ - lib/stp.c \ - lib/stp.h \ + lib/sort.c \ + lib/sort.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/string.h \ lib/svec.c \ lib/svec.h \ lib/tag.c \ @@ -109,42 +136,59 @@ 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/unaligned.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 \ lib/vlog.c \ - lib/vlog.h \ - lib/xtoxll.h + lib/vlog.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_WNO_UNUSED_PARAMETER +lib_libsflow_a_CFLAGS += -Wno-unused-parameter +endif + if HAVE_NETLINK lib_libopenvswitch_a_SOURCES += \ + lib/dpif-linux.c \ + lib/netdev-linux.c \ + lib/netdev-vport.c \ + lib/netdev-vport.h \ lib/netlink-protocol.h \ lib/netlink.c \ - lib/netlink.h + lib/netlink.h \ + lib/rtnetlink.c \ + lib/rtnetlink.h 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"' && \ @@ -163,10 +207,22 @@ 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/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 @@ -178,7 +234,8 @@ lib/dirs.c: Makefile echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp mv lib/dirs.c.tmp lib/dirs.c -install-data-local: +install-data-local: lib-install-data-local +lib-install-data-local: $(MKDIR_P) $(DESTDIR)$(RUNDIR) $(MKDIR_P) $(DESTDIR)$(PKIDIR) $(MKDIR_P) $(DESTDIR)$(LOGDIR) @@ -198,6 +255,8 @@ COVERAGE_FILES = \ lib/process.c \ lib/rconn.c \ lib/rtnetlink.c \ + lib/stream.c \ + lib/stream-ssl.c \ lib/timeval.c \ lib/unixctl.c \ lib/util.c \ @@ -205,9 +264,14 @@ 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 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