diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-12 13:26:05 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-18 09:24:10 +1000 |
| commit | 863fd1f0ebf145dc2b3a59e2a3e57dbc4ce77eaf (patch) | |
| tree | 3e3b18015b10cfd7551f0146424abfc227e467ce /tools | |
| parent | 20f5f2d962037888a1a00f651efb8d38f0480e57 (diff) | |
tools: drop libshared.la
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@who-t.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 4fc1046..79352b7 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 |