lib: Fix dependencies on ofp-errors.inc and ofp-msgs.inc.

[cascardo/ovs.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index f30459c..bd23ef7 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -15,7 +15,8 @@ endif
 
 lib_libopenvswitch_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/lib/libopenvswitch.sym
+        -Wl,--version-script=$(top_builddir)/lib/libopenvswitch.sym \
+        $(AM_LDFLAGS)
 
 lib_libopenvswitch_la_SOURCES = \
        lib/aes128.c \
@@ -59,6 +60,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 \
@@ -159,9 +162,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 \
@@ -175,12 +181,12 @@ 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/poll-loop.c \
        lib/poll-loop.h \
        lib/process.c \
@@ -191,7 +197,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 \
@@ -230,6 +235,11 @@ 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 \
@@ -238,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 \
@@ -254,17 +267,21 @@ 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 += \
@@ -295,7 +312,8 @@ CLEANFILES += $(nodist_lib_libopenvswitch_la_SOURCES)
 lib_LTLIBRARIES += lib/libsflow.la
 lib_libsflow_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/lib/libsflow.sym
+        -Wl,--version-script=$(top_builddir)/lib/libsflow.sym \
+        $(AM_LDFLAGS)
 lib_libsflow_la_SOURCES = \
        lib/sflow_api.h \
        lib/sflow.h \
@@ -325,8 +343,6 @@ lib_libopenvswitch_la_SOURCES += \
        lib/netlink-socket.h \
        lib/ovs-numa.c \
        lib/ovs-numa.h \
-       lib/ovs-router.c \
-       lib/ovs-router-linux.h \
        lib/rtnetlink-link.c \
        lib/rtnetlink-link.h \
        lib/route-table.c \
@@ -384,6 +400,10 @@ 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 \
@@ -420,10 +440,7 @@ 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 = \
@@ -433,14 +450,6 @@ $(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 $@
-
 lib/dirs.c: lib/dirs.c.in Makefile
        $(AM_V_GEN)($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
                -e 's,[@]srcdir[@],$(srcdir),g' \
@@ -477,14 +486,14 @@ $(srcdir)/lib/ofp-errors.inc: \
                $(srcdir)/lib/ofp-errors.h \
                $(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
        $(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