diff --git a/meson.build b/meson.build index 93bdfb1e..0a3028e0 100644 --- a/meson.build +++ b/meson.build @@ -342,16 +342,7 @@ endif ############ tools ############ tools_shared_sources = [ 'tools/shared.c', 'tools/shared.h' ] -event_debug_sources = [ 'tools/libinput-debug-events.c' ] + tools_shared_sources -executable('event-debug', - event_debug_sources, - dependencies : dep_libinput, - include_directories : include_directories('src'), - c_args : [ '-DTOOLS_BUILD_STANDALONE=1' ], - install : false - ) - -libinput_debug_events_sources = event_debug_sources +libinput_debug_events_sources = [ 'tools/libinput-debug-events.c' ] + tools_shared_sources executable('libinput-debug-events', libinput_debug_events_sources, dependencies : dep_libinput, diff --git a/tools/.gitignore b/tools/.gitignore index cb934298..2e4c93d3 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,4 +1,3 @@ -event-debug event-gui ptraccel-debug libinput-list-devices diff --git a/tools/Makefile.am b/tools/Makefile.am index 77b4e74c..68d1fd45 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = event-debug ptraccel-debug +noinst_PROGRAMS = ptraccel-debug bin_PROGRAMS = libinput-list-devices libinput-debug-events libinput AM_CPPFLAGS = -I$(top_srcdir)/include \ @@ -11,13 +11,6 @@ shared_sources = \ shared.c \ shared.h -event_debug_sources = libinput-debug-events.c $(shared_sources) -event_debug_SOURCES = libinput-debug-events.c $(shared_sources) -event_debug_LDADD = ../src/libinput.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) -event_debug_LDFLAGS = -no-install -event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) \ - -DTOOLS_BUILD_STANDALONE=1 - ptraccel_debug_SOURCES = ptraccel-debug.c ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la ptraccel_debug_LDFLAGS = -no-install @@ -28,9 +21,9 @@ libinput_list_devices_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) -DTOOLS_BUILD_STANDALONE=1 dist_man1_MANS = libinput-list-devices.1 -libinput_debug_events_SOURCES = $(event_debug_SOURCES) -libinput_debug_events_LDADD = $(event_debug_LDADD) -libinput_debug_events_CFLAGS = $(AM_CFLAGS) $(event_debug_CFLAGS) \ +libinput_debug_events_SOURCES = libinput-debug-events.c $(shared_sources) +libinput_debug_events_LDADD = ../src/libinput.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) +libinput_debug_events_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) \ -DTOOLS_BUILD_STANDALONE=1 dist_man1_MANS += libinput-debug-events.1