[clutter] build: list correct dependencies



commit efa7a66a70811490a8390c4c89bdb7ab3bd3dd5e
Author: Alejandro PiÃeiro <apinheiro igalia com>
Date:   Wed Aug 10 20:25:43 2011 +0200

    build: list correct dependencies
    
    Related to bug https://bugzilla.gnome.org/show_bug.cgi?id=656306#c4

 tests/micro-bench/Makefile.am |    4 +++-
 tests/performance/Makefile.am |    4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am
index 4a4613c..4f80543 100644
--- a/tests/micro-bench/Makefile.am
+++ b/tests/micro-bench/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
+common_ldadd = $(top_builddir)/clutter/libclutter- CLUTTER_SONAME_INFIX@- CLUTTER_API_VERSION@.la
+
 noinst_PROGRAMS = \
 	test-text \
 	test-picking \
@@ -20,7 +22,7 @@ AM_CFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
 
-AM_LDFLAGS = $(CLUTTER_LIBS)
+LDADD = $(common_ldadd) $(CLUTTER_LIBS)
 
 test_text_SOURCES = test-text.c
 test_picking_SOURCES = test-picking.c
diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am
index 259f777..a683b71 100644
--- a/tests/performance/Makefile.am
+++ b/tests/performance/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
 	-I$(top_srcdir)/clutter/cogl \
 	-I$(top_builddir)/clutter \
 	-I$(top_builddir)/clutter/cogl
-LDADD = $(top_builddir)/clutter/libclutter- CLUTTER_SONAME_INFIX@- CLUTTER_API_VERSION@.la
+LDADD = $(top_builddir)/clutter/libclutter- CLUTTER_SONAME_INFIX@- CLUTTER_API_VERSION@.la $(CLUTTER_LIBS)
 AM_CFLAGS = \
 	$(CLUTTER_CFLAGS) \
 	$(MAINTAINER_CFLAGS) \
@@ -27,8 +27,6 @@ perf-report: check
 check:
 	for a in $(noinst_PROGRAMS);do ./$$a;done;true
 
-AM_LDFLAGS = $(CLUTTER_LIBS)
-
 test_picking_SOURCES = test-picking.c
 test_text_perf_SOURCES = test-text-perf.c
 test_state_SOURCES = test-state.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]