diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | makekeys/Makefile.am | 11 |
3 files changed, 21 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index ac9cf8a..db4acc0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = makekeys + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xkbcommon.pc @@ -87,16 +89,12 @@ BUILT_SOURCES = \ src/ks_tables.h CLEANFILES = $(BUILT_SOURCES) -noinst_PROGRAMS = makekeys/makekeys -makekeys_makekeys_SOURCES = makekeys/makekeys.c -makekeys_makekeys_CC = $(CC_FOR_BUILD) -makekeys_makekeys_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) -makekeys_makekeys_CFLAGS = $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -makekeys_makekeys_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) - src/ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/makekeys/makekeys$(EXEEXT) $(top_builddir)/makekeys/makekeys $(KEYSYMDEFS) > $@ +$(top_builddir)/makekeys/makekeys$(EXEEXT): $(top_srcdir)/makekeys/makekeys.c + $(MAKE) -C makekeys + # Tests TESTS_ENVIRONMENT = diff --git a/configure.ac b/configure.ac index 04a737c..54bd6a5 100644 --- a/configure.ac +++ b/configure.ac @@ -114,5 +114,9 @@ AC_ARG_WITH([xkb_config_root], [XKBCONFIGROOT="$xkb_base"]) AC_SUBST([XKBCONFIGROOT]) -AC_CONFIG_FILES([Makefile xkbcommon.pc]) + +AC_CONFIG_FILES([ + Makefile + makekeys/Makefile + xkbcommon.pc]) AC_OUTPUT diff --git a/makekeys/Makefile.am b/makekeys/Makefile.am new file mode 100644 index 0000000..bb93777 --- /dev/null +++ b/makekeys/Makefile.am @@ -0,0 +1,11 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) + +# need to use build-native compiler + +CC = $(CC_FOR_BUILD) +CPPFLAGS = $(CPPFLAGS_FOR_BUILD) +CFLAGS = $(CFLAGS_FOR_BUILD) +LDFLAGS = $(LDFLAGS_FOR_BUILD) +noinst_PROGRAMS = makekeys + |