Move makekeys to separate subdir

The build is a little cleaner when makekeys has its own Makefile.

diff --git a/configure.ac b/configure.ac
index 093038f..9e13410 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,5 +77,6 @@ AC_OUTPUT([
 Makefile
 include/Makefile
 src/Makefile
+src/makekeys/Makefile
 test/Makefile
 ])

diff --git a/src/.gitignore b/src/.gitignore
index 2f94b37..1fd57cf 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,2 @@
 ks_tables.h
 libxkbcommon.la
-makekeys

diff --git a/src/Makefile.am b/src/Makefile.am
index 309cc04..e0dde83 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,15 @@
-INCLUDES = -I$(top_srcdir)/include
+SUBDIRS = makekeys
 
-noinst_PROGRAMS = makekeys
-makekeys_CFLAGS = $(X11_CFLAGS)
-makekeys: CC = $(CC_FOR_BUILD)
+INCLUDES = -I$(top_srcdir)/include
 
 BUILT_SOURCES = ks_tables.h
-ks_tables.h: makekeys
+ks_tables.h: $(builddir)/makekeys/makekeys$(EXEEXT)
        @rm -f $@
-       cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(builddir)/makekeys$(EXEEXT) >$@
+       cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | \
+         $(builddir)/makekeys/makekeys$(EXEEXT) >$@
+
+$(builddir)/makekeys/makekeys$(EXEEXT):
+       @cd makekeys && $(MAKE) $(AM_MAKEFLAGS)
 
 lib_LTLIBRARIES = libxkbcommon.la
 libxkbcommon_la_CFLAGS = $(X11_CFLAGS)

diff --git a/src/makekeys/.gitignore b/src/makekeys/.gitignore
new file mode 100644 (file)
index 0000000..2bdb5e0
--- /dev/null
+++ b/src/makekeys/.gitignore
@@ -0,0 +1 @@
+makekeys

diff --git a/src/makekeys/Makefile.am b/src/makekeys/Makefile.am
new file mode 100644 (file)
index 0000000..95f9262
--- /dev/null
+++ b/src/makekeys/Makefile.am
@@ -0,0 +1,6 @@
+INCLUDES = -I$(top_srcdir)/include
+
+# need to use build-native compiler
+CC = $(CC_FOR_BUILD)
+noinst_PROGRAMS = makekeys
+makekeys_CFLAGS = $(X11_CFLAGS)

diff --git a/src/makekeys.c b/src/makekeys/makekeys.c
similarity index 100%
rename from src/makekeys.c
rename to src/makekeys/makekeys.c