[PATCH evemu 15/16] python: move event-names.py generation into the toplevel python makefile

[Peter Hutterer]

Just to have things together

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 configure.ac             |  2 +-
 python/Makefile.am       | 10 ++++++----
 python/evemu/Makefile.am |  6 ------
 3 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 python/evemu/Makefile.am

diff --git a/configure.ac b/configure.ac
index e222d8d..eddfecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 AM_PATH_PYTHON([2.6])
 
 PKG_CHECK_MODULES([LIBEVDEV], [libevdev >= 0.5])
@@ -52,7 +53,6 @@ AC_SUBST(AM_CFLAGS,
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  python/Makefile
-                 python/evemu/Makefile
                  tools/Makefile
                  test/Makefile
                  evemu.pc])
diff --git a/python/Makefile.am b/python/Makefile.am
index 1725ed4..b529f1f 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = evemu
-
 nobase_python_PYTHON = \
 	evemu/__init__.py \
 	evemu/base.py \
@@ -48,6 +46,10 @@ evemu-test-runner: evemu-test-runner.in Makefile
 	  $< >$@
 	chmod +x $@
 
-BUILT_SOURCES = evemu-test-runner
-EXTRA_DIST =  evemu-test-runner.in $(test_sources)
+$(builddir)/evemu/event_names.py: Makefile $(srcdir)/evemu/make-event-names.py
+	$(MKDIR_P) evemu/
+	$(PYTHON) $(srcdir)/evemu/make-event-names.py > $@
+
+BUILT_SOURCES = evemu-test-runner $(builddir)/evemu/event_names.py
+EXTRA_DIST =  evemu-test-runner.in $(test_sources) $(srcdir)/evemu/make-event-names.py
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/python/evemu/Makefile.am b/python/evemu/Makefile.am
deleted file mode 100644
index 17b1462..0000000
--- a/python/evemu/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-event_names.py: Makefile make-event-names.py
-	$(PYTHON) $(srcdir)/make-event-names.py > $@
-
-BUILT_SOURCES = event_names.py
-CLEANFILES = event_names.py event_names.pyc
-EXTRA_DIST = make-event-names.py
-- 
1.9.3