Integrated python into existing build mechanism.

7 files changed, 46 insertions, 2 deletions

diff --git a/.bzrignore b/.bzrignore
index f3556d2..be7c30f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -11,6 +11,7 @@ ChangeLog
 config-aux
 config.*
 configure
+evemu-test-runner
 libtool
 stamp-*
 tools/evemu-describe
diff --git a/Makefile.am b/Makefile.am
index a97bdb1..d30f144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src tools
+SUBDIRS = src tools python
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = utouch-evemu.pc
diff --git a/configure.ac b/configure.ac
index 0ccef4d..20589c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AC_PROG_LIBTOOL
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
+AM_PATH_PYTHON([2.6])
 
 # man page generation
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
@@ -39,6 +40,7 @@ AC_SUBST(AM_CFLAGS,
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile
+                 python/Makefile
                  tools/Makefile
                  utouch-evemu.pc])
 AC_OUTPUT
diff --git a/python/Makefile.am b/python/Makefile.am
new file mode 100644
index 0000000..4b33e2c
--- /dev/null
+++ b/python/Makefile.am
@@ -0,0 +1,37 @@
+#
+# @file python/Makefile.am
+# @brief automake recipe for the uTouch evemu Python bindings
+#
+# Copyright 2011 Canonical, Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+nobase_python_PYTHON = \
+	$(wildcard evemu/*.py)
+
+check_SCRIPTS = evemu-test-runner
+
+TESTS = $(check_SCRIPTS)
+
+evemu-test-runner: evemu-test-runner.in Makefile
+	$(AM_V_GEN)$(SED) \
+	  -e 's,[@]builddir[@],$(builddir),g' \
+	  -e 's,[@]top_builddir[@],$(top_builddir),g' \
+	  -e 's,[@]srcdir[@],$(srcdir),g' \
+	  -e 's,[@]python[@],$(PYTHON),g' \
+	  $< >$@
+	chmod +x $@
+
+BUILT_SOURCES = evemu-test-runner
+EXTRA_DIST =  evemu-test-runner.in $(wildcard evemu/test*)
+CLEAN_FILES = $(BUILD_SOURCES)
diff --git a/python/Makefile b/python/Makefile.original
index 9dc959d..9dc959d 100644
--- a/python/Makefile
+++ b/python/Makefile.original
diff --git a/python/evemu-test-runner.in b/python/evemu-test-runner.in
new file mode 100644
index 0000000..2d5d28c
--- /dev/null
+++ b/python/evemu-test-runner.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+PYTHONPATH=@builddir@:@srcdir@ LD_LIBRARY_PATH=@top_builddir@/src/.libs @python@ -m evemu.testing.runner
+
diff --git a/python/evemu/const.py b/python/evemu/const.py
index 7851335..f70d022 100644
--- a/python/evemu/const.py
+++ b/python/evemu/const.py
@@ -1,4 +1,4 @@
-LIB = "libutouch-evemu"
+LIB = "utouch-evemu"
 DEFAULT_LIB = "/usr/lib/libutouch-evemu.so"
 LOCAL_LIB = "../src/.libs/libutouch-evemu.so"
 UINPUT_NODE = "/dev/uinput"