Merge commit '4b60911067a82fbdfa87b7c2824412da20287ed8'

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index ed7db7c..9f85de7 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -10,10 +10,10 @@ noinst_LIBRARIES += lib/libopenvswitch.a
 lib_libopenvswitch_a_SOURCES = \
        lib/aes128.c \
        lib/aes128.h \
-       lib/autopath.c \
-       lib/autopath.h \
        lib/backtrace.c \
        lib/backtrace.h \
+       lib/bfd.c \
+       lib/bfd.h \
        lib/bitmap.c \
        lib/bitmap.h \
        lib/bond.c \
@@ -61,6 +61,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/hmap.h \
        lib/hmapx.c \
        lib/hmapx.h \
+       lib/jhash.c \
+       lib/jhash.h \
        lib/json.c \
        lib/json.h \
        lib/jsonrpc.c \
@@ -79,6 +81,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
+       lib/match.c \
+       lib/match.h \
        lib/memory.c \
        lib/memory.h \
        lib/meta-flow.c \
@@ -86,7 +90,11 @@ lib_libopenvswitch_a_SOURCES = \
        lib/multipath.c \
        lib/multipath.h \
        lib/netdev-dummy.c \
+       lib/netdev-tunnel.c \
+       lib/netdev-pltap.c \
        lib/netdev-provider.h \
+       lib/netdev-vport.c \
+       lib/netdev-vport.h \
        lib/netdev.c \
        lib/netdev.h \
        lib/netflow.h \
@@ -109,6 +117,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/ofp-util.c \
        lib/ofp-util.def \
        lib/ofp-util.h \
+       lib/ofp-version-opt.h \
+       lib/ofp-version-opt.c \
        lib/ofpbuf.c \
        lib/ofpbuf.h \
        lib/ovsdb-data.c \
@@ -124,8 +134,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/ovsdb-types.h \
        lib/packets.c \
        lib/packets.h \
-       lib/pcap.c \
-       lib/pcap.h \
+       lib/pcap-file.c \
+       lib/pcap-file.h \
        lib/poll-loop.c \
        lib/poll-loop.h \
        lib/process.c \
@@ -179,6 +189,8 @@ lib_libopenvswitch_a_SOURCES = \
        lib/timeval.h \
        lib/token-bucket.c \
        lib/token-bucket.h \
+       lib/tunalloc.c \
+       lib/tunalloc.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \
@@ -225,14 +237,12 @@ if HAVE_WNO_UNUSED_PARAMETER
 lib_libsflow_a_CFLAGS += -Wno-unused-parameter
 endif
 
-if HAVE_NETLINK
+if LINUX_DATAPATH
 lib_libopenvswitch_a_SOURCES += \
        lib/dpif-linux.c \
        lib/dpif-linux.h \
        lib/netdev-linux.c \
        lib/netdev-linux.h \
-       lib/netdev-vport.c \
-       lib/netdev-vport.h \
        lib/netlink-notifier.c \
        lib/netlink-notifier.h \
        lib/netlink-protocol.h \
@@ -244,6 +254,11 @@ lib_libopenvswitch_a_SOURCES += \
        lib/route-table.h
 endif
 
+if ESX
+lib_libopenvswitch_a_SOURCES += \
+        lib/route-table-stub.c
+endif
+
 if HAVE_IF_DL
 lib_libopenvswitch_a_SOURCES += \
        lib/netdev-bsd.c \
@@ -280,6 +295,7 @@ MAN_FRAGMENTS += \
        lib/daemon-syn.man \
        lib/leak-checker.man \
        lib/memory-unixctl.man \
+       lib/ofp-version.man \
        lib/ovs.tmac \
        lib/ssl-bootstrap.man \
        lib/ssl-bootstrap-syn.man \
@@ -298,14 +314,16 @@ MAN_FRAGMENTS += \
 
 # vswitch IDL
 OVSIDL_BUILT += \
-       lib/vswitch-idl.c \
-       lib/vswitch-idl.h \
-       lib/vswitch-idl.ovsidl
+       $(srcdir)/lib/vswitch-idl.c \
+       $(srcdir)/lib/vswitch-idl.h \
+       $(srcdir)/lib/vswitch-idl.ovsidl
 
-EXTRA_DIST += lib/vswitch-idl.ann
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema lib/vswitch-idl.ann
-lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
-       $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+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 $@
 
 lib/dirs.c: lib/dirs.c.in Makefile
@@ -313,6 +331,7 @@ lib/dirs.c: lib/dirs.c.in Makefile
                -e 's,[@]srcdir[@],$(srcdir),g' \
                -e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
                -e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
+               -e 's,[@]DBDIR[@],"$(DBDIR)",g' \
                -e 's,[@]bindir[@],"$(bindir)",g' \
                -e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
                -e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
@@ -338,6 +357,7 @@ lib-install-data-local:
        $(MKDIR_P) $(DESTDIR)$(RUNDIR)
        $(MKDIR_P) $(DESTDIR)$(PKIDIR)
        $(MKDIR_P) $(DESTDIR)$(LOGDIR)
+       $(MKDIR_P) $(DESTDIR)$(DBDIR)
 
 if !USE_LINKER_SECTIONS
 # All distributed sources, with names adjust properly for referencing