X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=python%2FMakefile.am;h=82960d6bb68415113ebf2bf30374880cb459ec2d;hp=4c72bbd4d5ad4ea4aff94276546877ff8fec5bcb;hb=51672634fddc20095adc1300e0bfee2c99c604f5;hpb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204

diff --git a/python/Makefile.am b/python/Makefile.am
index 4c72bbd..82960d6 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -15,27 +15,41 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
-	guestfs.py \
+# Old RHEL 5 autoconf doesn't have builddir.
+builddir ?= $(top_builddir)/python
+
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = \
 	guestfs-py.c \
+	guestfs.py \
+	bindtests.py
+
+EXTRA_DIST = \
+	$(generator_built) \
+	run-bindtests \
+	run-python-tests \
 	t/*.py
 
 if HAVE_PYTHON
 
-pythondir = $(PYTHON_SITE_PACKAGES)
+pythondir = $(PYTHON_INSTALLDIR)
 
 python_DATA = guestfs.py
 
 python_LTLIBRARIES = libguestfsmod.la
 
-libguestfsmod_la_SOURCES = guestfs-py.c
-libguestfsmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) -I$(top_builddir)/src
+libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
+libguestfsmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
+			  -I$(top_srcdir)/src -I$(top_builddir)/src
 libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
+libguestfsmod_la_LDFLAGS = -avoid-version -shared
 
 TESTS_ENVIRONMENT = \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
-	PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs \
-	$(PYTHON)
-TESTS = t/005-import.py t/010-launch.py t/050-lvcreate.py
+	PYTHONPATH=$(builddir):$(builddir)/.libs \
+	TMPDIR=$(top_builddir)
+
+TESTS = run-bindtests run-python-tests
 
 endif