X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=27a16691ebda868db1d51689bc92e96359aa274b;hb=d0a46cb4608e632f5028034762f0adde2ce947a0;hp=b14a5108b0fa48a63c67066c418312dd75b4aeda;hpb=9efd308e957c26ab42a5210cc9fc7300c7d021f0;p=cascardo%2Fovs.git diff --git a/lib/automake.mk b/lib/automake.mk index b14a5108b..27a16691e 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -8,12 +8,16 @@ lib_LTLIBRARIES += lib/libopenvswitch.la lib_libopenvswitch_la_LIBADD = $(SSL_LIBS) +lib_libopenvswitch_la_LIBADD += $(CAPNG_LDADD) if WIN32 lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS} endif -lib_libopenvswitch_la_LDFLAGS = -release $(VERSION) +lib_libopenvswitch_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -Wl,--version-script=$(top_builddir)/lib/libopenvswitch.sym \ + $(AM_LDFLAGS) lib_libopenvswitch_la_SOURCES = \ lib/aes128.c \ @@ -23,7 +27,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/backtrace.h \ lib/bfd.c \ lib/bfd.h \ - lib/bitmap.c \ lib/bitmap.h \ lib/bundle.c \ lib/bundle.h \ @@ -34,6 +37,7 @@ lib_libopenvswitch_la_SOURCES = \ lib/cfm.h \ lib/classifier.c \ lib/classifier.h \ + lib/classifier-private.h \ lib/cmap.c \ lib/cmap.h \ lib/command-line.c \ @@ -47,9 +51,13 @@ lib_libopenvswitch_la_SOURCES = \ lib/crc32c.h \ lib/csum.c \ lib/csum.h \ + lib/ct-dpif.c \ + lib/ct-dpif.h \ lib/daemon.c \ lib/daemon.h \ lib/daemon-private.h \ + lib/db-ctl-base.c \ + lib/db-ctl-base.h \ lib/dhcp.h \ lib/dummy.c \ lib/dummy.h \ @@ -57,6 +65,8 @@ lib_libopenvswitch_la_SOURCES = \ lib/dirs.h \ lib/dpctl.c \ lib/dpctl.h \ + lib/dp-packet.h \ + lib/dp-packet.c \ lib/dpif-netdev.c \ lib/dpif-netdev.h \ lib/dpif-provider.h \ @@ -74,6 +84,7 @@ lib_libopenvswitch_la_SOURCES = \ lib/fatal-signal.h \ lib/flow.c \ lib/flow.h \ + lib/geneve.h \ lib/guarded-list.c \ lib/guarded-list.h \ lib/hash.c \ @@ -84,6 +95,8 @@ lib_libopenvswitch_la_SOURCES = \ lib/hmap.h \ lib/hmapx.c \ lib/hmapx.h \ + lib/id-pool.c \ + lib/id-pool.h \ lib/jhash.c \ lib/jhash.h \ lib/json.c \ @@ -97,7 +110,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/learn.h \ lib/learning-switch.c \ lib/learning-switch.h \ - lib/list.c \ lib/list.h \ lib/lockfile.c \ lib/lockfile.h \ @@ -138,6 +150,8 @@ lib_libopenvswitch_la_SOURCES = \ lib/ofp-parse.h \ lib/ofp-print.c \ lib/ofp-print.h \ + lib/ofp-prop.c \ + lib/ofp-prop.h \ lib/ofp-util.c \ lib/ofp-util.h \ lib/ofp-version-opt.h \ @@ -156,8 +170,12 @@ lib_libopenvswitch_la_SOURCES = \ lib/ovs-atomic-pthreads.h \ lib/ovs-atomic-x86_64.h \ lib/ovs-atomic.h \ + lib/ovs-lldp.c \ + lib/ovs-lldp.h \ lib/ovs-rcu.c \ lib/ovs-rcu.h \ + lib/ovs-router.h \ + lib/ovs-router.c \ lib/ovs-thread.c \ lib/ovs-thread.h \ lib/ovsdb-data.c \ @@ -171,12 +189,14 @@ lib_libopenvswitch_la_SOURCES = \ lib/ovsdb-parser.h \ lib/ovsdb-types.c \ lib/ovsdb-types.h \ - lib/packet-dpif.c \ - lib/packet-dpif.h \ lib/packets.c \ lib/packets.h \ lib/pcap-file.c \ lib/pcap-file.h \ + lib/perf-counter.h \ + lib/perf-counter.c \ + lib/pktbuf.c \ + lib/pktbuf.h \ lib/poll-loop.c \ lib/poll-loop.h \ lib/process.c \ @@ -187,6 +207,7 @@ lib_libopenvswitch_la_SOURCES = \ lib/random.h \ lib/rconn.c \ lib/rconn.h \ + lib/rculist.h \ lib/reconnect.c \ lib/reconnect.h \ lib/rstp.c \ @@ -213,6 +234,7 @@ lib_libopenvswitch_la_SOURCES = \ lib/sset.h \ lib/stp.c \ lib/stp.h \ + lib/stream-fd.c \ lib/stream-fd.h \ lib/stream-provider.h \ lib/stream-ssl.h \ @@ -223,16 +245,24 @@ lib_libopenvswitch_la_SOURCES = \ lib/string.c \ lib/svec.c \ lib/svec.h \ + lib/syslog-direct.c \ + lib/syslog-direct.h \ + lib/syslog-libc.c \ + lib/syslog-libc.h \ + lib/syslog-provider.h \ lib/table.c \ lib/table.h \ - lib/tag.c \ - lib/tag.h \ lib/timer.c \ lib/timer.h \ lib/timeval.c \ lib/timeval.h \ + lib/tnl-neigh-cache.c \ + lib/tnl-neigh-cache.h \ + lib/tnl-ports.c \ + lib/tnl-ports.h \ lib/token-bucket.c \ - lib/token-bucket.h \ + lib/tun-metadata.c \ + lib/tun-metadata.h \ lib/type-props.h \ lib/unaligned.h \ lib/unicode.c \ @@ -247,17 +277,19 @@ lib_libopenvswitch_la_SOURCES = \ lib/vconn-provider.h \ lib/vconn-stream.c \ lib/vconn.c \ - lib/vconn.h \ lib/vlan-bitmap.c \ lib/vlan-bitmap.h \ lib/vlandev.c \ lib/vlandev.h \ lib/vlog.c \ - lib/vlog.h \ - lib/vswitch-idl.c \ - lib/vswitch-idl.h \ - lib/vtep-idl.c \ - lib/vtep-idl.h + lib/lldp/aa-structs.h \ + lib/lldp/lldp.c \ + lib/lldp/lldp-const.h \ + lib/lldp/lldp-tlv.h \ + lib/lldp/lldpd.c \ + lib/lldp/lldpd.h \ + lib/lldp/lldpd-structs.c \ + lib/lldp/lldpd-structs.h if WIN32 lib_libopenvswitch_la_SOURCES += \ @@ -266,8 +298,8 @@ lib_libopenvswitch_la_SOURCES += \ lib/getrusage-windows.c \ lib/latch-windows.c \ lib/route-table-stub.c \ - lib/strsep.c \ - lib/stream-fd-windows.c + lib/if-notifier-stub.c \ + lib/strsep.c else lib_libopenvswitch_la_SOURCES += \ lib/daemon-unix.c \ @@ -275,7 +307,6 @@ lib_libopenvswitch_la_SOURCES += \ lib/signals.c \ lib/signals.h \ lib/socket-util-unix.c \ - lib/stream-fd-unix.c \ lib/stream-unix.c endif @@ -284,11 +315,16 @@ EXTRA_DIST += \ lib/string.h.in nodist_lib_libopenvswitch_la_SOURCES = \ - lib/dirs.c + lib/dirs.c \ + lib/vswitch-idl.c \ + lib/vswitch-idl.h CLEANFILES += $(nodist_lib_libopenvswitch_la_SOURCES) lib_LTLIBRARIES += lib/libsflow.la -lib_libsflow_la_LDFLAGS = -release $(VERSION) +lib_libsflow_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -Wl,--version-script=$(top_builddir)/lib/libsflow.sym \ + $(AM_LDFLAGS) lib_libsflow_la_SOURCES = \ lib/sflow_api.h \ lib/sflow.h \ @@ -307,10 +343,14 @@ endif if LINUX lib_libopenvswitch_la_SOURCES += \ - lib/dpif-linux.c \ - lib/dpif-linux.h \ + lib/dpif-netlink.c \ + lib/dpif-netlink.h \ + lib/if-notifier.c \ + lib/if-notifier.h \ lib/netdev-linux.c \ lib/netdev-linux.h \ + lib/netlink-conntrack.c \ + lib/netlink-conntrack.h \ lib/netlink-notifier.c \ lib/netlink-notifier.h \ lib/netlink-protocol.h \ @@ -318,8 +358,8 @@ lib_libopenvswitch_la_SOURCES += \ lib/netlink-socket.h \ lib/ovs-numa.c \ lib/ovs-numa.h \ - lib/rtnetlink-link.c \ - lib/rtnetlink-link.h \ + lib/rtnetlink.c \ + lib/rtnetlink.h \ lib/route-table.c \ lib/route-table.h endif @@ -332,6 +372,9 @@ endif if WIN32 lib_libopenvswitch_la_SOURCES += \ + lib/dpif-netlink.c \ + lib/dpif-netlink.h \ + lib/netdev-windows.c \ lib/netlink-notifier.c \ lib/netlink-notifier.h \ lib/netlink-protocol.h \ @@ -347,11 +390,13 @@ endif if ESX lib_libopenvswitch_la_SOURCES += \ - lib/route-table-stub.c + lib/route-table-stub.c \ + lib/if-notifier-stub.c endif if HAVE_IF_DL lib_libopenvswitch_la_SOURCES += \ + lib/if-notifier-bsd.c \ lib/netdev-bsd.c \ lib/rtbsd.c \ lib/rtbsd.h \ @@ -362,21 +407,26 @@ if HAVE_OPENSSL lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem - (echo '#include "lib/dhparams.h"' && \ + $(AM_V_GEN)(echo '#include "lib/dhparams.h"' && \ openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ - | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp + | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ mv lib/dhparams.c.tmp lib/dhparams.c else lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c endif +pkgconfig_DATA += \ + $(srcdir)/lib/libopenvswitch.pc \ + $(srcdir)/lib/libsflow.pc + EXTRA_DIST += \ lib/dh1024.pem \ lib/dh2048.pem \ lib/dh4096.pem \ - lib/dirs.c.in + lib/dirs.c.in \ + lib/db-ctl-base.xml MAN_FRAGMENTS += \ lib/common.man \ @@ -384,6 +434,7 @@ MAN_FRAGMENTS += \ lib/coverage-unixctl.man \ lib/daemon.man \ lib/daemon-syn.man \ + lib/db-ctl-base.man \ lib/dpctl.man \ lib/memory-unixctl.man \ lib/ofp-version.man \ @@ -393,6 +444,7 @@ MAN_FRAGMENTS += \ lib/ssl-bootstrap.man \ lib/ssl-bootstrap-syn.man \ lib/ssl-peer-ca-cert.man \ + lib/ssl-peer-ca-cert-syn.man \ lib/ssl.man \ lib/ssl-syn.man \ lib/table.man \ @@ -405,32 +457,14 @@ MAN_FRAGMENTS += \ lib/vlog.man # vswitch IDL -OVSIDL_BUILT += \ - $(srcdir)/lib/vswitch-idl.c \ - $(srcdir)/lib/vswitch-idl.h \ - $(srcdir)/lib/vswitch-idl.ovsidl \ - $(srcdir)/lib/vtep-idl.c \ - $(srcdir)/lib/vtep-idl.h \ - $(srcdir)/lib/vtep-idl.ovsidl +OVSIDL_BUILT += lib/vswitch-idl.c lib/vswitch-idl.h lib/vswitch-idl.ovsidl -EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann -VSWITCH_IDL_FILES = \ - $(srcdir)/vswitchd/vswitch.ovsschema \ - $(srcdir)/lib/vswitch-idl.ann -$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES) - $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp - mv $@.tmp $@ - -EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann -VTEP_IDL_FILES = \ - $(srcdir)/vtep/vtep.ovsschema \ - $(srcdir)/lib/vtep-idl.ann -$(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES) - $(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp - mv $@.tmp $@ +EXTRA_DIST += lib/vswitch-idl.ann +lib/vswitch-idl.ovsidl: vswitchd/vswitch.ovsschema lib/vswitch-idl.ann + $(AM_V_GEN)$(OVSDB_IDLC) annotate $(srcdir)/vswitchd/vswitch.ovsschema $(srcdir)/lib/vswitch-idl.ann > $@.tmp && mv $@.tmp $@ lib/dirs.c: lib/dirs.c.in Makefile - ($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \ + $(AM_V_GEN)($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \ -e 's,[@]srcdir[@],$(srcdir),g' \ -e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \ -e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \ @@ -438,33 +472,42 @@ lib/dirs.c: lib/dirs.c.in Makefile -e 's,[@]bindir[@],"$(bindir)",g' \ -e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \ -e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \ - > lib/dirs.c.tmp + > lib/dirs.c.tmp && \ mv lib/dirs.c.tmp lib/dirs.c +lib/meta-flow.inc: $(srcdir)/build-aux/extract-ofp-fields lib/meta-flow.h + $(AM_V_GEN)$(run_python) $^ --meta-flow > $@.tmp && mv $@.tmp $@ +lib/meta-flow.lo: lib/meta-flow.inc +lib/nx-match.inc: $(srcdir)/build-aux/extract-ofp-fields lib/meta-flow.h + $(AM_V_GEN)$(run_python) $^ --nx-match > $@.tmp && mv $@.tmp $@ +lib/nx-match.lo: lib/nx-match.inc +CLEANFILES += lib/meta-flow.inc lib/nx-match.inc +EXTRA_DIST += build-aux/extract-ofp-fields + lib/ofp-actions.inc1: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c - $(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN)$(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@ lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c - $(run_python) $^ --definitions > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN)$(run_python) $^ --definitions > $@.tmp && mv $@.tmp $@ lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2 CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2 -EXTRA_DIST += build-aux/extract-ofp-actions lib/ofp-errors.inc +EXTRA_DIST += build-aux/extract-ofp-actions -$(srcdir)/lib/ofp-errors.inc: \ - lib/ofp-errors.h include/openflow/openflow-common.h \ +lib/ofp-errors.inc: lib/ofp-errors.h include/openflow/openflow-common.h \ $(srcdir)/build-aux/extract-ofp-errors - $(run_python) $(srcdir)/build-aux/extract-ofp-errors \ + $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-errors \ $(srcdir)/lib/ofp-errors.h \ - $(srcdir)/include/openflow/openflow-common.h > $@.tmp + $(srcdir)/include/openflow/openflow-common.h > $@.tmp && \ mv $@.tmp $@ -$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc -EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc +lib/ofp-errors.lo: lib/ofp-errors.inc +CLEANFILES += lib/ofp-errors.inc +EXTRA_DIST += build-aux/extract-ofp-errors -$(srcdir)/lib/ofp-msgs.inc: \ - lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs - $(run_python) $(srcdir)/build-aux/extract-ofp-msgs \ +lib/ofp-msgs.inc: lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs + $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-msgs \ $(srcdir)/lib/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@ -$(srcdir)/lib/ofp-msgs.c: $(srcdir)/lib/ofp-msgs.inc -EXTRA_DIST += build-aux/extract-ofp-msgs lib/ofp-msgs.inc +lib/ofp-msgs.lo: lib/ofp-msgs.inc +CLEANFILES += lib/ofp-msgs.inc +EXTRA_DIST += build-aux/extract-ofp-msgs INSTALL_DATA_LOCAL += lib-install-data-local lib-install-data-local: