fishHEADmaster

3 files changed, 15 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 64995ab..a7c401e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,17 @@ CSRCS=kmd.c status.c lcd.c input.c dispatch.c output.c map.c layout.c video_swit
 
 WHERE=$(shell hostname | sed -e 's/^.*medaka.james.local/BROMIUM/g' -e 's/^.*panaceas.*/HOME/g' )
 
-CPPFLAGS=-D${WHERE}
-CFLAGS=-g -Wall -Wno-unused
+CFLAGS=-g -Wall -D${WHERE} -Wno-unused
 
 all: kmd 
 
-%.o: %.c
-	$(CC) ${CPPFLAGS} $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^
+%.o: %.c project.h
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ ${@:%.o=%.c}
 
 OBJS=${CSRCS:%.c=%.o}
 
+output.o:output_map.h output.c
+
 
 kmd: ${OBJS} libdpf/libdpf.a
 	$(CC) -o $@ ${OBJS} libdpf/libdpf.a -lusb
@@ -27,7 +28,7 @@ clean:
 
 protos:
 	echo > prototypes.h
-	cproto -e -v  ${CPPFLAGS} ${CSRCS} >> prototypes.tmp
+	cproto -e -v  ${CSRCS} >> prototypes.tmp
 	mv -f prototypes.tmp prototypes.h
 
 install: kmd
@@ -38,4 +39,4 @@ install: kmd
 	
 
 
-
+output.o: output_map.h
diff --git a/output_map.h b/output_map.h
index 646f28b..ab6411f 100644
--- a/output_map.h
+++ b/output_map.h
@@ -36,13 +36,15 @@ static struct map_ent map[] = {
 
 #ifdef APPLE_KEYBOARD
   {
-   HACK_NONE, 0x29, KEY_102ND},
+  HACK_NONE, 0x29, KEY_102ND },
+#if 0
   {
-   HACK_NONE, 0x65, KEY_ESC},
+  HACK_NONE, 0x65, KEY_ESC},
+#endif
   {
-   HACK_NONE, 0x48, KEY_F19},
+  HACK_NONE, 0x48, KEY_F19},
   {
-   HACK_NONE, 0x64, KEY_GRAVE},
+  HACK_NONE, 0x64, KEY_GRAVE},
 #endif
 
 #if 0
diff --git a/project.h b/project.h
index eba3de8..0018d23 100644
--- a/project.h
+++ b/project.h
@@ -11,8 +11,8 @@
 #include <stdint.h>
 
 #ifdef BROMIUM
-#define APPLE_KEYBOARD
-#define N_COMPUTER 4
+#undef APPLE_KEYBOARD
+#define N_COMPUTER 5
 #define N_CONSOLE 1
 #define MAP_NULL
 #define LAYOUT_NULL