From 89377d5cd1ea1dc0d5ce925cddf3260e08ba3b6a Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 8 Dec 2010 21:20:46 -0500 Subject: [PATCH] config: use existing variables KEYSYMDEF_H and XF86KEYSYM_H These automake variables are not currently used. The variable KS_HEADERS is not required anymore. Reviewed-by: Jeremy Huddleston Signed-off-by: Gaetan Nadon --- configure.ac | 3 --- src/makekeys/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b982839..7f8f9fa 100644 --- a/configure.ac +++ b/configure.ac @@ -87,9 +87,6 @@ test -f "$XF86KEYSYM_H" || AC_MSG_ERROR([can't locate XF86keysym.h in $includex1 AC_MSG_RESULT([$XF86KEYSYM_H]) AC_SUBST([XF86KEYSYM_H]) -# Aggregate the headers full paths for makekeys -AC_SUBST([KS_HEADERS], ['$(KEYSYMDEF_H) $(XF86KEYSYM_H)']) - # Define a configuration option for the XKB config root AC_ARG_WITH([xkb_config_root], [AS_HELP_STRING([--with-xkb-config-root=], diff --git a/src/makekeys/Makefile.am b/src/makekeys/Makefile.am index 44d5081..1847034 100644 --- a/src/makekeys/Makefile.am +++ b/src/makekeys/Makefile.am @@ -10,4 +10,4 @@ CLEANFILES = ks_tables.h ks_tables.h: makekeys$(EXEEXT) @rm -f $@ - cat $(KS_HEADERS) | $(builddir)/makekeys$(EXEEXT) > $@ + cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) | $(builddir)/makekeys$(EXEEXT) > $@ -- 2.7.4