diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-12-01 12:11:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-12-20 15:01:56 +1000 |
| commit | d254f902ef0452b63d39935b670814cdabe31534 (patch) | |
| tree | caf7b2066117c9bb14cdd6a077e1084c31bd2a15 | |
| parent | b47fa8a0aa0b987e675222fd18195a759d40ecaa (diff) | |
| download | xf86-input-wacom-d254f902ef0452b63d39935b670814cdabe31534.tar.gz | |
Move the X-driver-specific files into src/x11
These two files are the only ones that interact with the X server, let's
move them so we have a visible separation between the core driver and
the X parts.
Renaming wcmXCommand.c to xf86WacomProperties.c in the process, for
slightly better namespacing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/common.mk | 4 | ||||
| -rw-r--r-- | src/x11/xf86Wacom.c (renamed from src/xf86Wacom.c) | 0 | ||||
| -rw-r--r-- | src/x11/xf86WacomProperties.c (renamed from src/wcmXCommand.c) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 5ff7022..74b867e 100644 --- a/meson.build +++ b/meson.build @@ -123,11 +123,11 @@ src_wacom = [ 'src/wcmTouchFilter.h', 'src/wcmUSB.c', 'src/wcmValidateDevice.c', - 'src/wcmXCommand.c', - 'src/xf86Wacom.c', 'src/xf86WacomDefs.h', 'src/xf86Wacom.h', 'src/wcmUSB.c', + 'src/x11/xf86WacomProperties.c', + 'src/x11/xf86Wacom.c', ] if get_option('serial-device-support') diff --git a/src/common.mk b/src/common.mk index cbd5a96..a48717e 100644 --- a/src/common.mk +++ b/src/common.mk @@ -2,7 +2,8 @@ DRIVER_SOURCES= \ $(top_srcdir)/src/WacomInterface.h \ - $(top_srcdir)/src/xf86Wacom.c \ + $(top_srcdir)/src/x11/xf86Wacom.c \ + $(top_srcdir)/src/x11/xf86WacomProperties.c \ $(top_srcdir)/src/xf86Wacom.h \ $(top_srcdir)/src/wcmCommon.c \ $(top_srcdir)/src/wcmConfig.c \ @@ -11,7 +12,6 @@ DRIVER_SOURCES= \ $(top_srcdir)/src/wcmFilter.h \ $(top_srcdir)/src/xf86WacomDefs.h \ $(top_srcdir)/src/wcmUSB.c \ - $(top_srcdir)/src/wcmXCommand.c \ $(top_srcdir)/src/wcmValidateDevice.c \ $(top_srcdir)/src/wcmTouchFilter.c \ $(top_srcdir)/src/wcmTouchFilter.h diff --git a/src/xf86Wacom.c b/src/x11/xf86Wacom.c index 5babf82..5babf82 100644 --- a/src/xf86Wacom.c +++ b/src/x11/xf86Wacom.c diff --git a/src/wcmXCommand.c b/src/x11/xf86WacomProperties.c index d7a42e6..d7a42e6 100644 --- a/src/wcmXCommand.c +++ b/src/x11/xf86WacomProperties.c |