From 3d534c36b1f423ee98c17efe57ab560096f60eb1 Mon Sep 17 00:00:00 2001 From: Diego Nieto Cid Date: Wed, 6 Apr 2011 16:14:34 -0300 Subject: Remove default keymap. * console-client/xkb/default.xkb: Removed file. * console-client/xkb/makeconf.sh: Likewise. * console-client/xkb/xkbdefaults.c: Likewise. * console-client/xkb/parser.y(parse_xkbconfig): Don't use harcoded defaults, return error when no keymap file is given. --- console-client/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'console-client/Makefile') diff --git a/console-client/Makefile b/console-client/Makefile index 6fb96275..7629e06a 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -55,7 +55,7 @@ XKB_DATA_FILES = keymap/hurd types/hurd symbols/hurd CPPFLAGS += -DQUAERENDO_INVENIETIS DIST_FILES = xkb/HACKING xkb/MISSING-FEATURES xkb/README xkb/TODO \ - xkb/default.xkb xkb/makeconf.sh xkb/kstoucs_map.sh \ + xkb/kstoucs_map.sh \ $(addprefix xkb/xkb-data/, $(XKB_DATA_FILES)) include ../Makeconf @@ -112,8 +112,7 @@ parser.tab.h: parser.y fi XKB_SRCS = xkb/compose.c xkb/kstoucs.c xkb/parser.y xkb/lex.l \ - xkb/xkb.c xkb/xkbdata.c xkb/xkbdefaults.c \ - xkb/xkbtimer.c + xkb/xkb.c xkb/xkbdata.c xkb/xkbtimer.c ifeq ($(HAVE_X11),yes) XKB_UNITS = $(basename $(notdir $(XKB_SRCS))) pc_kbd.so.$(hurd-version): $(addsuffix _pic.o,$(XKB_UNITS)) -- cgit v1.2.3