X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fautomake.mk;h=27a16691ebda868db1d51689bc92e96359aa274b;hb=8f79bb4d3999d993424e9578342b4130d10a556c;hp=2a5844b15ff56b39b92b48164fda3bb6ed828c2d;hpb=4a1f523f2d760e9e5751bc93519d1b70c5492b56;p=cascardo%2Fovs.git diff --git a/lib/automake.mk b/lib/automake.mk index 2a5844b15..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,6 +8,7 @@ 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} @@ -50,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 \ @@ -60,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 \ @@ -77,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 \ @@ -142,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 \ @@ -160,6 +170,8 @@ 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 \ @@ -177,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 \ @@ -193,7 +207,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/random.h \ lib/rconn.c \ lib/rconn.h \ - lib/rculist.c \ lib/rculist.h \ lib/reconnect.c \ lib/reconnect.h \ @@ -232,19 +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-arp-cache.c \ - lib/tnl-arp-cache.h \ + lib/tnl-neigh-cache.c \ + lib/tnl-neigh-cache.h \ lib/tnl-ports.c \ lib/tnl-ports.h \ lib/token-bucket.c \ + lib/tun-metadata.c \ + lib/tun-metadata.h \ lib/type-props.h \ lib/unaligned.h \ lib/unicode.c \ @@ -264,10 +282,14 @@ lib_libopenvswitch_la_SOURCES = \ lib/vlandev.c \ lib/vlandev.h \ lib/vlog.c \ - 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 += \ @@ -276,6 +298,7 @@ lib_libopenvswitch_la_SOURCES += \ lib/getrusage-windows.c \ lib/latch-windows.c \ lib/route-table-stub.c \ + lib/if-notifier-stub.c \ lib/strsep.c else lib_libopenvswitch_la_SOURCES += \ @@ -292,7 +315,9 @@ 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 @@ -320,8 +345,12 @@ if LINUX lib_libopenvswitch_la_SOURCES += \ 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 \ @@ -329,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 @@ -361,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 \ @@ -394,7 +425,8 @@ 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 \ @@ -402,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 \ @@ -411,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 \ @@ -423,29 +457,11 @@ 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) - $(AM_V_GEN)$(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) - $(AM_V_GEN)$(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 $(AM_V_GEN)($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \ @@ -476,22 +492,22 @@ 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 -$(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 $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-errors \ $(srcdir)/lib/ofp-errors.h \ $(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 +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: