lib: Fix dependencies on ofp-errors.inc and ofp-msgs.inc.
[cascardo/ovs.git] / lib / automake.mk
index 449d2c5..bd23ef7 100644 (file)
@@ -8,7 +8,15 @@
 lib_LTLIBRARIES += lib/libopenvswitch.la
 
 lib_libopenvswitch_la_LIBADD = $(SSL_LIBS)
-lib_libopenvswitch_la_LDFLAGS = -release $(VERSION)
+
+if WIN32
+lib_libopenvswitch_la_LIBADD += ${PTHREAD_LIBS}
+endif
+
+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 \
@@ -18,7 +26,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 \
@@ -29,6 +36,9 @@ 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 \
        lib/command-line.h \
        lib/compiler.h \
@@ -42,12 +52,18 @@ lib_libopenvswitch_la_SOURCES = \
        lib/csum.h \
        lib/daemon.c \
        lib/daemon.h \
+       lib/daemon-private.h \
        lib/dhcp.h \
        lib/dummy.c \
        lib/dummy.h \
        lib/dhparams.h \
        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 \
        lib/dpif.c \
        lib/dpif.h \
@@ -73,6 +89,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 \
@@ -81,13 +99,11 @@ lib_libopenvswitch_la_SOURCES = \
        lib/jsonrpc.h \
        lib/lacp.c \
        lib/lacp.h \
-       lib/latch.c \
        lib/latch.h \
        lib/learn.c \
        lib/learn.h \
        lib/learning-switch.c \
        lib/learning-switch.h \
-       lib/list.c \
        lib/list.h \
        lib/lockfile.c \
        lib/lockfile.h \
@@ -95,6 +111,8 @@ lib_libopenvswitch_la_SOURCES = \
        lib/mac-learning.h \
        lib/match.c \
        lib/match.h \
+       lib/mcast-snooping.c \
+       lib/mcast-snooping.h \
        lib/memory.c \
        lib/memory.h \
        lib/meta-flow.c \
@@ -127,7 +145,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ofp-print.c \
        lib/ofp-print.h \
        lib/ofp-util.c \
-       lib/ofp-util.def \
        lib/ofp-util.h \
        lib/ofp-version-opt.h \
        lib/ofp-version-opt.c \
@@ -136,12 +153,21 @@ lib_libopenvswitch_la_SOURCES = \
        lib/ovs-atomic-c11.h \
        lib/ovs-atomic-clang.h \
        lib/ovs-atomic-flag-gcc4.7+.h \
-       lib/ovs-atomic-gcc4+.c \
        lib/ovs-atomic-gcc4+.h \
        lib/ovs-atomic-gcc4.7+.h \
-       lib/ovs-atomic-pthreads.c \
+       lib/ovs-atomic-i586.h \
+       lib/ovs-atomic-locked.c \
+       lib/ovs-atomic-locked.h \
+       lib/ovs-atomic-msvc.h \
        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 \
@@ -159,16 +185,26 @@ lib_libopenvswitch_la_SOURCES = \
        lib/packets.h \
        lib/pcap-file.c \
        lib/pcap-file.h \
+       lib/perf-counter.h \
+       lib/perf-counter.c \
        lib/poll-loop.c \
        lib/poll-loop.h \
        lib/process.c \
        lib/process.h \
+       lib/pvector.c \
+       lib/pvector.h \
        lib/random.c \
        lib/random.h \
        lib/rconn.c \
        lib/rconn.h \
+       lib/rculist.h \
        lib/reconnect.c \
        lib/reconnect.h \
+       lib/rstp.c \
+       lib/rstp.h \
+       lib/rstp-common.h \
+       lib/rstp-state-machines.c \
+       lib/rstp-state-machines.h \
        lib/sat-math.h \
        lib/seq.c \
        lib/seq.h \
@@ -178,8 +214,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/shash.h \
        lib/simap.c \
        lib/simap.h \
-       lib/signals.c \
-       lib/signals.h \
        lib/smap.c \
        lib/smap.h \
        lib/socket-util.c \
@@ -195,13 +229,17 @@ lib_libopenvswitch_la_SOURCES = \
        lib/stream-provider.h \
        lib/stream-ssl.h \
        lib/stream-tcp.c \
-       lib/stream-unix.c \
        lib/stream.c \
        lib/stream.h \
        lib/stdio.c \
        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 \
@@ -210,8 +248,11 @@ lib_libopenvswitch_la_SOURCES = \
        lib/timer.h \
        lib/timeval.c \
        lib/timeval.h \
+       lib/tnl-arp-cache.c \
+       lib/tnl-arp-cache.h \
+       lib/tnl-ports.c \
+       lib/tnl-ports.h \
        lib/token-bucket.c \
-       lib/token-bucket.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \
@@ -226,17 +267,40 @@ 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 += \
+       lib/daemon-windows.c \
+       lib/getopt_long.c \
+       lib/getrusage-windows.c \
+       lib/latch-windows.c \
+       lib/route-table-stub.c \
+       lib/strsep.c
+else
+lib_libopenvswitch_la_SOURCES += \
+       lib/daemon-unix.c \
+       lib/latch-unix.c \
+       lib/signals.c \
+       lib/signals.h \
+       lib/socket-util-unix.c \
+       lib/stream-unix.c
+endif
+
 EXTRA_DIST += \
        lib/stdio.h.in \
        lib/string.h.in
@@ -246,7 +310,10 @@ nodist_lib_libopenvswitch_la_SOURCES = \
 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 \
@@ -263,10 +330,10 @@ if HAVE_WNO_UNUSED_PARAMETER
 lib_libsflow_la_CFLAGS += -Wno-unused-parameter
 endif
 
-if LINUX_DATAPATH
+if LINUX
 lib_libopenvswitch_la_SOURCES += \
-       lib/dpif-linux.c \
-       lib/dpif-linux.h \
+       lib/dpif-netlink.c \
+       lib/dpif-netlink.h \
        lib/netdev-linux.c \
        lib/netdev-linux.h \
        lib/netlink-notifier.c \
@@ -274,12 +341,32 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netlink-protocol.h \
        lib/netlink-socket.c \
        lib/netlink-socket.h \
+       lib/ovs-numa.c \
+       lib/ovs-numa.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \
        lib/route-table.h
 endif
 
+if DPDK_NETDEV
+lib_libopenvswitch_la_SOURCES += \
+       lib/netdev-dpdk.c \
+       lib/netdev-dpdk.h
+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 \
+       lib/netlink-socket.c \
+       lib/netlink-socket.h
+endif
+
 if HAVE_POSIX_AIO
 lib_libopenvswitch_la_SOURCES += lib/async-append-aio.c
 else
@@ -303,16 +390,20 @@ 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 \
@@ -325,9 +416,12 @@ MAN_FRAGMENTS += \
        lib/coverage-unixctl.man \
        lib/daemon.man \
        lib/daemon-syn.man \
+       lib/dpctl.man \
        lib/memory-unixctl.man \
        lib/ofp-version.man \
        lib/ovs.tmac \
+       lib/service.man \
+       lib/service-syn.man \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
        lib/ssl-peer-ca-cert.man \
@@ -346,29 +440,18 @@ MAN_FRAGMENTS += \
 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
+       $(srcdir)/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
+       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.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' \
@@ -376,24 +459,41 @@ 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
+       $(AM_V_GEN)$(run_python) $^ --prototypes > $@.tmp && mv $@.tmp $@
+lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
+       $(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
+
 $(srcdir)/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
+lib/ofp-errors.lo: $(srcdir)/lib/ofp-errors.inc
 EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
 
 $(srcdir)/lib/ofp-msgs.inc: \
        lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
-       $(run_python) $(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
+lib/ofp-msgs.lo: $(srcdir)/lib/ofp-msgs.inc
 EXTRA_DIST += build-aux/extract-ofp-msgs lib/ofp-msgs.inc
 
 INSTALL_DATA_LOCAL += lib-install-data-local