Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision cee8d3e109ecfcf59fb15c03ff1c4a23c5e3ac81)
+++ uspace/srv/kbd/Makefile	(revision a78d001740e2ccd838b22b766e7d7338534733e0)
@@ -50,15 +50,8 @@
 
 ARCH_SOURCES =
-GENARCH_SOURCES =
-
-ifeq ($(KBD_LAYOUT), cz)
-	GENARCH_SOURCES += layout/cz.c
-endif
-ifeq ($(KBD_LAYOUT), us_qwerty)
-	GENARCH_SOURCES += layout/us_qwerty.c
-endif
-ifeq ($(KBD_LAYOUT), us_dvorak)
-	GENARCH_SOURCES += layout/us_dvorak.c
-endif
+GENARCH_SOURCES = \
+	layout/cz.c \
+	layout/us_qwerty.c \
+	layout/us_dvorak.c
 
 ifeq ($(UARCH), amd64)
