[planner] Fix build with ld --as-needed
- From: Alexandre Franke <afranke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner] Fix build with ld --as-needed
- Date: Mon, 12 Mar 2012 17:22:33 +0000 (UTC)
commit 4a81253815e32a098b363e4261d69418922bbde9
Author: Julian Taylor <jtaylor ubuntu com>
Date: Mon Mar 12 18:12:25 2012 +0100
Fix build with ld --as-needed
Libraries must be behind objects (including static libraries)
tests/Makefile.am | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ca64fd..1294577 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,9 +8,9 @@ INCLUDES = \
-DEXAMPLESDIR=\"$(top_srcdir)/tests/files\"
LDADD = \
+ $(PLANNER_LIBS) \
$(top_builddir)/src/libplannerapp.la \
- $(top_builddir)/libplanner/libplanner-1.la \
- $(PLANNER_LIBS)
+ $(top_builddir)/libplanner/libplanner-1.la
check_LTLIBRARIES = libselfcheck.la
@@ -21,19 +21,19 @@ libselfcheck_la_SOURCES = \
check_PROGRAMS = $(TESTS)
scheduler_test_SOURCES = scheduler-test.c
-scheduler_test_LDADD = $(LDADD) libselfcheck.la
+scheduler_test_LDADD = libselfcheck.la $(LDADD)
time_test_SOURCES = time-test.c
-time_test_LDADD = $(LDADD) libselfcheck.la
+time_test_LDADD = libselfcheck.la $(LDADD)
calendar_test_SOURCES = calendar-test.c
-calendar_test_LDADD = $(LDADD) libselfcheck.la
+calendar_test_LDADD = libselfcheck.la $(LDADD)
task_test_SOURCES = task-test.c
-task_test_LDADD = $(LDADD) libselfcheck.la
+task_test_LDADD = libselfcheck.la $(LDADD)
cmd_manager_test_SOURCES = cmd-manager-test.c
-cmd_manager_test_LDADD = $(LDADD) libselfcheck.la
+cmd_manager_test_LDADD = libselfcheck.la $(LDADD)
TESTS_ENVIRONMENT = \
PLANNER_STORAGEMODULEDIR=$(top_builddir)/libplanner/.libs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]