X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fautomake.mk;h=f6b2aa1b09a3d267b7322d3e131e04c483c9a439;hb=361906b1e2c6482d77280f345d3e42048d8c2700;hp=ed7db7ce17ae9f96503f40b2da2ee94d68964409;hpb=982697a4d24caa0a3bdaf85db67619338b382e50;p=sliver-openvswitch.git

diff --git a/lib/automake.mk b/lib/automake.mk
index ed7db7ce1..f6b2aa1b0 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -79,6 +79,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 \
@@ -225,7 +227,7 @@ 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 \
@@ -244,6 +246,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 \
@@ -298,14 +305,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 +322,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 +348,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