From e4bac112aae6ee286bf8929fdf51330de28a63dd Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 12 Jun 2019 13:36:47 +0200 Subject: [PATCH] fixup! Simplify Synaptics driver This contains the following changes: * Remove the subdirectories for src/include * Drop the include directory logic from the build (not needed anymore with above, and it was also broken when the synaptics driver was not enabled) --- libfprint/drivers/synaptics/{src => }/bmkt.c | 0 .../drivers/synaptics/{include => }/bmkt.h | 0 .../synaptics/{include => }/bmkt_internal.h | 0 .../synaptics/{src => }/bmkt_message.c | 0 .../synaptics/{include => }/bmkt_message.h | 0 .../synaptics/{include => }/bmkt_response.h | 0 .../drivers/synaptics/{src => }/sensor.c | 0 .../drivers/synaptics/{include => }/sensor.h | 0 .../drivers/synaptics/{src => }/synaptics.c | 0 .../synaptics/{include => }/synaptics.h | 0 .../synaptics/{src => }/usb_transport.c | 0 .../synaptics/{include => }/usb_transport.h | 0 libfprint/drivers/synaptics/{src => }/util.c | 0 libfprint/meson.build | 24 +++++++------------ 14 files changed, 8 insertions(+), 16 deletions(-) rename libfprint/drivers/synaptics/{src => }/bmkt.c (100%) rename libfprint/drivers/synaptics/{include => }/bmkt.h (100%) rename libfprint/drivers/synaptics/{include => }/bmkt_internal.h (100%) rename libfprint/drivers/synaptics/{src => }/bmkt_message.c (100%) rename libfprint/drivers/synaptics/{include => }/bmkt_message.h (100%) rename libfprint/drivers/synaptics/{include => }/bmkt_response.h (100%) rename libfprint/drivers/synaptics/{src => }/sensor.c (100%) rename libfprint/drivers/synaptics/{include => }/sensor.h (100%) rename libfprint/drivers/synaptics/{src => }/synaptics.c (100%) rename libfprint/drivers/synaptics/{include => }/synaptics.h (100%) rename libfprint/drivers/synaptics/{src => }/usb_transport.c (100%) rename libfprint/drivers/synaptics/{include => }/usb_transport.h (100%) rename libfprint/drivers/synaptics/{src => }/util.c (100%) diff --git a/libfprint/drivers/synaptics/src/bmkt.c b/libfprint/drivers/synaptics/bmkt.c similarity index 100% rename from libfprint/drivers/synaptics/src/bmkt.c rename to libfprint/drivers/synaptics/bmkt.c diff --git a/libfprint/drivers/synaptics/include/bmkt.h b/libfprint/drivers/synaptics/bmkt.h similarity index 100% rename from libfprint/drivers/synaptics/include/bmkt.h rename to libfprint/drivers/synaptics/bmkt.h diff --git a/libfprint/drivers/synaptics/include/bmkt_internal.h b/libfprint/drivers/synaptics/bmkt_internal.h similarity index 100% rename from libfprint/drivers/synaptics/include/bmkt_internal.h rename to libfprint/drivers/synaptics/bmkt_internal.h diff --git a/libfprint/drivers/synaptics/src/bmkt_message.c b/libfprint/drivers/synaptics/bmkt_message.c similarity index 100% rename from libfprint/drivers/synaptics/src/bmkt_message.c rename to libfprint/drivers/synaptics/bmkt_message.c diff --git a/libfprint/drivers/synaptics/include/bmkt_message.h b/libfprint/drivers/synaptics/bmkt_message.h similarity index 100% rename from libfprint/drivers/synaptics/include/bmkt_message.h rename to libfprint/drivers/synaptics/bmkt_message.h diff --git a/libfprint/drivers/synaptics/include/bmkt_response.h b/libfprint/drivers/synaptics/bmkt_response.h similarity index 100% rename from libfprint/drivers/synaptics/include/bmkt_response.h rename to libfprint/drivers/synaptics/bmkt_response.h diff --git a/libfprint/drivers/synaptics/src/sensor.c b/libfprint/drivers/synaptics/sensor.c similarity index 100% rename from libfprint/drivers/synaptics/src/sensor.c rename to libfprint/drivers/synaptics/sensor.c diff --git a/libfprint/drivers/synaptics/include/sensor.h b/libfprint/drivers/synaptics/sensor.h similarity index 100% rename from libfprint/drivers/synaptics/include/sensor.h rename to libfprint/drivers/synaptics/sensor.h diff --git a/libfprint/drivers/synaptics/src/synaptics.c b/libfprint/drivers/synaptics/synaptics.c similarity index 100% rename from libfprint/drivers/synaptics/src/synaptics.c rename to libfprint/drivers/synaptics/synaptics.c diff --git a/libfprint/drivers/synaptics/include/synaptics.h b/libfprint/drivers/synaptics/synaptics.h similarity index 100% rename from libfprint/drivers/synaptics/include/synaptics.h rename to libfprint/drivers/synaptics/synaptics.h diff --git a/libfprint/drivers/synaptics/src/usb_transport.c b/libfprint/drivers/synaptics/usb_transport.c similarity index 100% rename from libfprint/drivers/synaptics/src/usb_transport.c rename to libfprint/drivers/synaptics/usb_transport.c diff --git a/libfprint/drivers/synaptics/include/usb_transport.h b/libfprint/drivers/synaptics/usb_transport.h similarity index 100% rename from libfprint/drivers/synaptics/include/usb_transport.h rename to libfprint/drivers/synaptics/usb_transport.h diff --git a/libfprint/drivers/synaptics/src/util.c b/libfprint/drivers/synaptics/util.c similarity index 100% rename from libfprint/drivers/synaptics/src/util.c rename to libfprint/drivers/synaptics/util.c diff --git a/libfprint/meson.build b/libfprint/meson.build index c9eb905..336f158 100644 --- a/libfprint/meson.build +++ b/libfprint/meson.build @@ -74,14 +74,6 @@ aesx660 = false aes3k = false drivers_sources = [] drivers_cflags = [] -synaptics_drivers_sources = [ - 'drivers/synaptics/src/synaptics.c', - 'drivers/synaptics/src/bmkt.c', - 'drivers/synaptics/src/util.c', - 'drivers/synaptics/src/bmkt_message.c', - 'drivers/synaptics/src/sensor.c', - 'drivers/synaptics/src/usb_transport.c', -] foreach driver: drivers if driver == 'upekts' @@ -156,7 +148,14 @@ foreach driver: drivers drivers_sources += [ 'drivers/elan.c', 'drivers/elan.h' ] endif if driver == 'synaptics' - drivers_sources += synaptics_drivers_sources + drivers_sources += [ + 'drivers/synaptics/synaptics.c', + 'drivers/synaptics/bmkt.c', + 'drivers/synaptics/util.c', + 'drivers/synaptics/bmkt_message.c', + 'drivers/synaptics/sensor.c', + 'drivers/synaptics/usb_transport.c', + ] endif endforeach @@ -193,12 +192,6 @@ libfprint_sources += configure_file(input: 'empty_file', deps = [ mathlib_dep, glib_dep, libusb_dep, nss_dep, imaging_dep ] -if driver == 'synaptics' - synaptics_include_directories = [ - 'drivers/synaptics/include', - ] -endif - libfprint = library('fprint', libfprint_sources + drivers_sources + nbis_sources + other_sources, soversion: soversion, @@ -207,7 +200,6 @@ libfprint = library('fprint', include_directories: [ root_inc, include_directories('nbis/include'), - include_directories(synaptics_include_directories), ], dependencies: deps, install: true)