Merge branch 'master' of github.com:MerlijnWajer/uinput-mapper

Conflicts:
	Makefile

Makefile

@@ -1,19 +1,26 @@
 .PHONY: default clean
 
-CFLAGS+=-ansi -pedantic -Wall -Wextra -Werror -Wno-unused-result
-CFLAGS+=-pipe -O2
-CFLAGS+=-D_BSD_SOURCE
+PREFIX=/usr/local
+CFLAGS+=-ansi -pedantic -pipe -D_BSD_SOURCE \
+	-Wall -Wextra -Werror -Wno-unused-result
+OPT=-O2
 
-default: map
+all: map
+
+debug: OPT=-O0
+debug: CFLAGS+=-ggdb
+debug: map
 
 def_keys.h:
-	echo '#include <linux/input.h>' | gcc -E -dM - | grep '#define KEY_' | cut -f2 -d" " | sed 's/KEY_.*/DEF_KEY(&)/' > def_keys.h
+	echo '#include <linux/input.h>' | gcc -E -dM - \
+	| grep '#define KEY_' | cut -f2 -d" " | sed 's/KEY_.*/DEF_KEY(&)/' \
+	> $@
 
 def_buttons.h:
 	echo '#include <linux/input.h>' | gcc -E -dM - | grep '#define BTN_' | cut -f2 -d" " | sed 's/BTN_.*/DEF_BTN(&)/' > def_buttons.h
 
 map: map.c def_keys.h def_buttons.h config.h config_functions.h
-	$(CC) map.c $(CFLAGS) -o map
+	$(CC) $(CFLAGS) ${OPT} map.c -o $@
 
 all: map
 	mv config.h config.bak
@@ -27,3 +34,6 @@ all: map
 
 clean:
 	rm -f map def_keys.h map_*
+
+install:
+	install map ${PREFIX}/sbin/uinput-mapper