X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=135e58f9a800c3412a6df4531045e42803107d42;hb=ac60863f78e412004c5b69f5a64a49bc6f0bc46d;hp=32e85d1e6246fa7aa2fe9576bedb365f6d0559c4;hpb=0141e875a14cc30fe9c207a83616861055531d4d;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 32e85d1e6..135e58f9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,15 +22,23 @@ AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
 endif
 
+if WIN32
+psep=";"
+else
+psep=":"
+endif
 # PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
 # files.  Creating .py[co] works OK for any given version of Open
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-run_python = \
-	PYTHONDONTWRITEBYTECODE=yes \
-	PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
-	$(PYTHON)
+if INCLUDE_PYTHON_COMPAT
+run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH
+else
+run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH
+endif
+run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -39,6 +47,7 @@ CLEAN_LOCAL =
 DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
+	BUILD.Windows \
 	CodingStyle \
 	DESIGN \
 	FAQ \
@@ -62,6 +71,7 @@ EXTRA_DIST = \
 	SubmittingPatches \
 	WHY-OVS \
 	boot.sh \
+	build-aux/cccl \
 	build-aux/sodepends.pl \
 	build-aux/soexpand.pl \
 	$(MAN_FRAGMENTS) \
@@ -276,3 +286,4 @@ include python/automake.mk
 include python/compat/automake.mk
 include planetlab/automake.mk
 include tutorial/automake.mk
+include vtep/automake.mk