[PATCH libinput 1/4] tools: drop libshared.la

[Peter Hutterer]

Include the source files directly, we'll need per-target compiler flags that
affect different tools differently in the future.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 tools/Makefile.am | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4fc1046e..79352b72 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,5 @@
 noinst_PROGRAMS = event-debug ptraccel-debug
 bin_PROGRAMS = libinput-list-devices libinput-debug-events
-noinst_LTLIBRARIES = libshared.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/include \
               -I$(top_srcdir)/src \
@@ -8,14 +7,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CXXFLAGS = $(GCC_CXXFLAGS)
 
-libshared_la_SOURCES = \
-		       shared.c \
-		       shared.h
-libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS)
-libshared_la_LIBADD = $(LIBEVDEV_LIBS)
+shared_sources = \
+		 shared.c \
+		 shared.h
 
-event_debug_SOURCES = event-debug.c
-event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
+event_debug_SOURCES = event-debug.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)
 
@@ -23,9 +20,9 @@ ptraccel_debug_SOURCES = ptraccel-debug.c
 ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la
 ptraccel_debug_LDFLAGS = -no-install
 
-libinput_list_devices_SOURCES = libinput-list-devices.c
-libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)
-libinput_list_devices_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS)
+libinput_list_devices_SOURCES = libinput-list-devices.c $(shared_sources)
+libinput_list_devices_LDADD = ../src/libinput.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
+libinput_list_devices_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
 dist_man1_MANS = libinput-list-devices.1
 
 libinput_debug_events_SOURCES = $(event_debug_SOURCES)
@@ -36,9 +33,11 @@ dist_man1_MANS += libinput-debug-events.1
 if BUILD_EVENTGUI
 noinst_PROGRAMS += event-gui
 
-event_gui_SOURCES = event-gui.c
-event_gui_LDADD = ../src/libinput.la libshared.la $(CAIRO_LIBS) $(GTK_LIBS) $(LIBUDEV_LIBS)
-event_gui_CFLAGS = $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBUDEV_CFLAGS) $(AM_CFLAGS)
+event_gui_SOURCES = event-gui.c $(shared_sources)
+event_gui_LDADD = ../src/libinput.la $(CAIRO_LIBS) $(GTK_LIBS) \
+		  $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
+event_gui_CFLAGS = $(CAIRO_CFLAGS) $(GTK_CFLAGS) \
+		   $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) $(AM_CFLAGS)
 event_gui_LDFLAGS = -no-install
 endif
 
-- 
2.12.2