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 2acfe18..bd23ef7 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -185,6 +185,8 @@ 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 \
@@ -195,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 \
@@ -234,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 \
@@ -268,8 +274,6 @@ lib_libopenvswitch_la_SOURCES = \
        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 \
@@ -436,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 = \
@@ -449,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' \
@@ -493,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