From 90267f32912c69d6b5524c22e0c2fe9ab2f62be4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 16 Mar 2021 07:03:03 +1000
Subject: tools: install our list-devices helper tool

Build it twice, once as list-devices, once as libwacom-list-devices. The
former uses the source tree's data files, the latter the installed data files.

Having this as installed tools makes it easier to debug situations where it's
not clear whether the data file is picked up correctly or whether it's not
applied correctly to the device. It also makes it easier to figure out "is
this device supported by my libwacom version".

Fixes #367

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 tools/Makefile.am               | 18 +++++++++++++-----
 tools/libwacom-list-devices.man | 19 +++++++++++++++++++
 tools/list-devices.c            |  4 ++++
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 tools/libwacom-list-devices.man

(limited to 'tools')

diff --git a/tools/Makefile.am b/tools/Makefile.am
index bbecb19..239c3fc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,24 +1,32 @@
-AM_CPPFLAGS=-I$(top_srcdir)/libwacom -DDATABASEPATH="\"$(abs_top_srcdir)/data\""
+AM_CPPFLAGS=-I$(top_srcdir)/libwacom
+
+DBPATH_CFLAGS=-DDATABASEPATH="\"$(abs_top_srcdir)/data\""
 
 noinst_PROGRAMS = generate-hwdb list-devices list-compatible-styli
 
 generate_hwdb_SOURCES = generate-hwdb.c
 generate_hwdb_LDADD=$(top_builddir)/libwacom/libwacom.la $(GLIB_LIBS)
-generate_hwdb_CFLAGS=$(GLIB_CFLAGS)
+generate_hwdb_CFLAGS=$(GLIB_CFLAGS) $(DBPATH_CFLAGS)
 
 list_devices_SOURCES = list-devices.c
 list_devices_LDADD=$(top_builddir)/libwacom/libwacom.la $(GLIB_LIBS)
-list_devices_CFLAGS=$(GLIB_CFLAGS)
+list_devices_CFLAGS=$(GLIB_CFLAGS) $(DBPATH_CFLAGS)
 
 list_compatible_styli_SOURCES = list-compatible-styli.c
 list_compatible_styli_LDADD=$(top_builddir)/libwacom/libwacom.la
+list_compatible_styli_CFLAGS=$(DBPATH_CFLAGS)
+
+bin_PROGRAMS = libwacom-list-local-devices libwacom-list-devices
+
+libwacom_list_devices_SOURCES = list-devices.c
+libwacom_list_devices_LDADD=$(top_builddir)/libwacom/libwacom.la $(GLIB_LIBS)
+libwacom_list_devices_CFLAGS=$(GLIB_CFLAGS)
 
-bin_PROGRAMS = libwacom-list-local-devices
 libwacom_list_local_devices_SOURCES = list-local-devices.c
 libwacom_list_local_devices_LDADD=$(top_builddir)/libwacom/libwacom.la $(GLIB_LIBS)
 libwacom_list_local_devices_CFLAGS=$(GLIB_CFLAGS)
 
-dist_man1_MANS = libwacom-list-local-devices.man
+dist_man1_MANS = libwacom-list-local-devices.man libwacom-list-devices.man
 
 rules = 65-libwacom.rules
 udev_rulesdir=$(UDEV_DIR)/rules.d
diff --git a/tools/libwacom-list-devices.man b/tools/libwacom-list-devices.man
new file mode 100644
index 0000000..0f02063
--- /dev/null
+++ b/tools/libwacom-list-devices.man
@@ -0,0 +1,19 @@
+.TH libwacom-list-devices 1
+
+.SH NAME
+libwacom-list-devices - utility to list supported tablet devices
+
+.SH SYNOPSIS
+.B libwacom-list-devices [--format=oneline|datafile]
+
+.SH DESCRIPTION
+libwacom-list-devices is a debug utility to list all supported tablet
+devices identified by libwacom. It is usually used to check whether a
+libwacom installation is correct after adding custom data files.
+.SH OPTIONS
+.TP 8
+.B --format=oneline|datafile
+Sets the output format to be used. If \fIoneline\fR, the output format is a
+one-line format comprising the bus type, vendor and product ID and the
+device name. If \fIdatafile\fR, the output format matches
+the tablet data files. The default is \fIoneline\fR.
diff --git a/tools/list-devices.c b/tools/list-devices.c
index 16434e9..636071d 100644
--- a/tools/list-devices.c
+++ b/tools/list-devices.c
@@ -114,7 +114,11 @@ int main(int argc, char **argv)
 	}
 	g_option_context_free (context);
 
+#ifdef DATABASEPATH
 	db = libwacom_database_new_for_path(DATABASEPATH);
+#else
+	db = libwacom_database_new();
+#endif
 
 	list = libwacom_list_devices_from_database(db, NULL);
 	if (!list) {
-- 
cgit v1.2.1