Rename and install test binaries

Install the test programs as grail-touch and grail-gesture.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

6 files changed, 39 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index 904dc45..87fa680 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,8 +76,6 @@ core
 #               Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 #
-test/touch
-test/grail
+test/grail-touch
+test/grail-gesture
 patches
-.bzr
-.bzrignore
diff --git a/src/mtdev-details.h b/src/mtdev-details.h
deleted file mode 100644
index 873528d..0000000
--- a/src/mtdev-details.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _MTDEV_DETAILS_H
-#define _MTDEV_DETAILS_H
-
-#define MTDEV_TRACKING_ID       9
-#define MTDEV_POSITION_X        5
-#define MTDEV_POSITION_Y        6
-#define MTDEV_TOUCH_MAJOR       0
-#define MTDEV_TOUCH_MINOR       1
-#define MTDEV_WIDTH_MAJOR       2
-#define MTDEV_WIDTH_MINOR       3
-#define MTDEV_ORIENTATION       4
-#define MTDEV_PRESSURE          10
-
-int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev);
-void mtdev_put_event(struct mtdev *dev, const struct input_event *ev);
-int mtdev_empty(struct mtdev *dev);
-void mtdev_get_event(struct mtdev *dev, struct input_event* ev);
-
-#endif
diff --git a/src/touch-dev.c b/src/touch-dev.c
index 3c3036c..b327266 100644
--- a/src/touch-dev.c
+++ b/src/touch-dev.c
@@ -27,7 +27,22 @@
 #include <string.h>
 #include <errno.h>
 #include "evbuf.h"
-#include "mtdev-details.h"
+
+/* from mtdev-mapping.h */
+#define MT_TOUCH_MAJOR  0
+#define MT_TOUCH_MINOR  1
+#define MT_WIDTH_MAJOR  2
+#define MT_WIDTH_MINOR  3
+#define MT_ORIENTATION  4
+#define MT_POSITION_X   5
+#define MT_POSITION_Y   6
+#define MT_TRACKING_ID  9
+#define MT_PRESSURE     10
+
+int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev);
+void mtdev_put_event(struct mtdev *dev, const struct input_event *ev);
+int mtdev_empty(struct mtdev *dev);
+void mtdev_get_event(struct mtdev *dev, struct input_event* ev);
 
 struct touch_dev_impl {
         int id[DIM_TOUCH];
@@ -49,22 +64,22 @@ static inline void set_info(struct touch_dev_caps *caps, int code,
 static void set_caps(struct touch_dev_caps *caps,
                      const struct mtdev_caps *mtcaps)
 {
-        if (mtcaps->has_abs[MTDEV_POSITION_X])
-                set_info(caps, TP_POS_X, &mtcaps->abs[MTDEV_POSITION_X]);
-        if (mtcaps->has_abs[MTDEV_POSITION_Y])
-                set_info(caps, TP_POS_Y, &mtcaps->abs[MTDEV_POSITION_Y]);
-        if (mtcaps->has_abs[MTDEV_TOUCH_MAJOR])
-                set_info(caps, TP_TOUCH_MAJOR, &mtcaps->abs[MTDEV_TOUCH_MAJOR]);
-        if (mtcaps->has_abs[MTDEV_TOUCH_MINOR])
-                set_info(caps, TP_TOUCH_MINOR, &mtcaps->abs[MTDEV_TOUCH_MINOR]);
-        if (mtcaps->has_abs[MTDEV_WIDTH_MAJOR])
-                set_info(caps, TP_WIDTH_MAJOR, &mtcaps->abs[MTDEV_WIDTH_MAJOR]);
-        if (mtcaps->has_abs[MTDEV_WIDTH_MINOR])
-                set_info(caps, TP_WIDTH_MINOR, &mtcaps->abs[MTDEV_WIDTH_MINOR]);
-        if (mtcaps->has_abs[MTDEV_ORIENTATION])
-                set_info(caps, TP_ORIENTATION, &mtcaps->abs[MTDEV_ORIENTATION]);
-        if (mtcaps->has_abs[MTDEV_PRESSURE])
-                set_info(caps, TP_PRESSURE, &mtcaps->abs[MTDEV_PRESSURE]);
+        if (mtcaps->has_abs[MT_POSITION_X])
+                set_info(caps, TP_POS_X, &mtcaps->abs[MT_POSITION_X]);
+        if (mtcaps->has_abs[MT_POSITION_Y])
+                set_info(caps, TP_POS_Y, &mtcaps->abs[MT_POSITION_Y]);
+        if (mtcaps->has_abs[MT_TOUCH_MAJOR])
+                set_info(caps, TP_TOUCH_MAJOR, &mtcaps->abs[MT_TOUCH_MAJOR]);
+        if (mtcaps->has_abs[MT_TOUCH_MINOR])
+                set_info(caps, TP_TOUCH_MINOR, &mtcaps->abs[MT_TOUCH_MINOR]);
+        if (mtcaps->has_abs[MT_WIDTH_MAJOR])
+                set_info(caps, TP_WIDTH_MAJOR, &mtcaps->abs[MT_WIDTH_MAJOR]);
+        if (mtcaps->has_abs[MT_WIDTH_MINOR])
+                set_info(caps, TP_WIDTH_MINOR, &mtcaps->abs[MT_WIDTH_MINOR]);
+        if (mtcaps->has_abs[MT_ORIENTATION])
+                set_info(caps, TP_ORIENTATION, &mtcaps->abs[MT_ORIENTATION]);
+        if (mtcaps->has_abs[MT_PRESSURE])
+                set_info(caps, TP_PRESSURE, &mtcaps->abs[MT_PRESSURE]);
 }
 
 static int touch_get_fetched(struct touch_dev_impl *x,
diff --git a/test/Makefile.am b/test/Makefile.am
index e0498ba..4ccbe0a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,9 @@
-noinst_PROGRAMS = touch grail
+bin_PROGRAMS = grail-touch grail-gesture
 
 INCLUDES=-I$(top_srcdir)/include/
 
-touch_SOURCES = touch.c
-touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
+grail_touch_SOURCES = grail-touch.c
+grail_touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
 
-grail_SOURCES = grail.c
-grail_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
+grail_gesture_SOURCES = grail-gesture.c
+grail_gesture_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm
diff --git a/test/grail.c b/test/grail-gesture.c
index f34bd6f..f34bd6f 100644
--- a/test/grail.c
+++ b/test/grail-gesture.c
diff --git a/test/touch.c b/test/grail-touch.c
index 8893c0d..8893c0d 100644
--- a/test/touch.c
+++ b/test/grail-touch.c