[gnome-builder] build: fix linking on Ubuntu
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: fix linking on Ubuntu
- Date: Mon, 23 Mar 2015 23:37:35 +0000 (UTC)
commit ef972eea1fded50e648e217d0e53fcfb43af331f
Author: yannick inizan <inizan yannick gmail com>
Date: Wed Feb 18 15:44:32 2015 -0800
build: fix linking on Ubuntu
tests/tests.mk | 4 ++--
tools/Makefile.am | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/tests/tests.mk b/tests/tests.mk
index 40f21fa..d9129ed 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -18,7 +18,7 @@ test_ide_context_SOURCES = tests/test-ide-context.c
test_ide_context_CFLAGS = \
$(libide_1_0_la_CFLAGS) \
-DTEST_DATA_DIR="\"$(top_srcdir)/tests/data\""
-test_ide_context_LDADD = libide-1.0.la
+test_ide_context_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += test-ide-back-forward-list
@@ -27,7 +27,7 @@ test_ide_back_forward_list_SOURCES = tests/test-ide-back-forward-list.c
test_ide_back_forward_list_CFLAGS = \
$(libide_1_0_la_CFLAGS) \
-DTEST_DATA_DIR="\"$(top_srcdir)/tests/data\""
-test_ide_back_forward_list_LDADD = libide-1.0.la
+test_ide_back_forward_list_LDADD = libide-1.0.la $(LIBIDE_LIBS)
EXTRA_DIST += \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2e9e132..ead210a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,29 +2,29 @@
noinst_PROGRAMS += ide-build
ide_build_SOURCES = tools/ide-build.c
ide_build_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_build_LDADD = libide-1.0.la
+ide_build_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += ide-list-file-settings
ide_list_file_settings_SOURCES = tools/ide-list-file-settings.c
ide_list_file_settings_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_list_file_settings_LDADD = libide-1.0.la
+ide_list_file_settings_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += ide-list-devices
ide_list_devices_SOURCES = tools/ide-list-devices.c
ide_list_devices_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_list_devices_LDADD = libide-1.0.la
+ide_list_devices_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += ide-list-diagnostics
ide_list_diagnostics_SOURCES = tools/ide-list-diagnostics.c
ide_list_diagnostics_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_list_diagnostics_LDADD = libide-1.0.la
+ide_list_diagnostics_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += ide-list-files
ide_list_files_SOURCES = tools/ide-list-files.c
ide_list_files_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_list_files_LDADD = libide-1.0.la
+ide_list_files_LDADD = libide-1.0.la $(LIBIDE_LIBS)
noinst_PROGRAMS += ide-search
ide_search_SOURCES = tools/ide-search.c
ide_search_CFLAGS = $(libide_1_0_la_CFLAGS)
-ide_search_LDADD = libide-1.0.la
+ide_search_LDADD = libide-1.0.la $(LIBIDE_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]