From ad13bac1f4f491eaf86179c3e90e4ae2764803b7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Aug 2014 07:57:25 +1000 Subject: [PATCH] Use -no-install instead of -static for local noinst linking The goal of -static was to avoid the libtool wrappers for easier debugging. The -no-install flag does exactly that, without requiring static linking. Related to https://bugs.freedesktop.org/show_bug.cgi?id=82292 Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- test/Makefile.am | 16 ++++++++-------- tools/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 35c3bf84..76d4e8cb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -48,35 +48,35 @@ TESTS = $(run_tests) test_udev_SOURCES = udev.c test_udev_LDADD = $(TEST_LIBS) -test_udev_LDFLAGS = -static +test_udev_LDFLAGS = -no-install test_path_SOURCES = path.c test_path_LDADD = $(TEST_LIBS) -test_path_LDFLAGS = -static +test_path_LDFLAGS = -no-install test_pointer_SOURCES = pointer.c test_pointer_LDADD = $(TEST_LIBS) -test_pointer_LDFLAGS = -static +test_pointer_LDFLAGS = -no-install test_touch_SOURCES = touch.c test_touch_LDADD = $(TEST_LIBS) -test_touch_LDFLAGS = -static +test_touch_LDFLAGS = -no-install test_log_SOURCES = log.c test_log_LDADD = $(TEST_LIBS) -test_log_LDFLAGS = -static +test_log_LDFLAGS = -no-install test_touchpad_SOURCES = touchpad.c test_touchpad_LDADD = $(TEST_LIBS) -test_touchpad_LDFLAGS = -static +test_touchpad_LDFLAGS = -no-install test_misc_SOURCES = misc.c test_misc_LDADD = $(TEST_LIBS) -test_misc_LDFLAGS = -static +test_misc_LDFLAGS = -no-install test_keyboard_SOURCES = keyboard.c test_keyboard_LDADD = $(TEST_LIBS) -test_keyboard_LDFLAGS = -static +test_keyboard_LDFLAGS = -no-install # build-test only test_build_pedantic_c99_SOURCES = build-pedantic.c diff --git a/tools/Makefile.am b/tools/Makefile.am index f59068da..aadd874a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ event_debug_SOURCES = event-debug.c event_debug_LDADD = ../src/libinput.la $(LIBUDEV_LIBS) -event_debug_LDFLAGS = -static +event_debug_LDFLAGS = -no-install event_debug_CFLAGS = $(LIBUDEV_CFLAGS) if BUILD_EVENTGUI @@ -14,5 +14,5 @@ noinst_PROGRAMS += event-gui event_gui_SOURCES = event-gui.c event_gui_LDADD = ../src/libinput.la $(CAIRO_LIBS) $(GTK_LIBS) $(LIBUDEV_LIBS) event_gui_CFLAGS = $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(LIBUDEV_CFLAGS) -event_gui_LDFLAGS = -static +event_gui_LDFLAGS = -no-install endif -- 2.34.1