[epiphany] tests: simplify Makefile.am



commit ba2d2c19ac174acbf74aa4258a82ac5ac7c7f455
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Thu Jan 21 17:14:38 2010 -0500

    tests: simplify Makefile.am
    
    Don't cherry pick internal libraries for tests.

 tests/Makefile.am |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7302f6e..d8ba9d4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,34 +4,44 @@ noinst_PROGRAMS = \
 	testephyzoomcontrol
 
 INCLUDES = \
-	-I$(top_srcdir)/lib		 \
-	-I$(top_srcdir)/lib/widgets
+	-I$(top_srcdir)/embed    \
+	-I$(top_srcdir)/lib      \
+	-I$(top_srcdir)/lib/widgets \
+	-I$(top_srcdir)/src      \
+	-I$(top_srcdir)/src/bookmarks
 
 CFLAGS = \
 	$(DEPENDENCIES_CFLAGS) \
 	$(AM_CFLAGS)
 
 LDADD = \
+	$(top_builddir)/src/libephymain.la \
+	$(top_builddir)/src/bookmarks/libephybookmarks.la \
+	$(top_builddir)/embed/libephyembed.la \
+	$(top_builddir)/lib/widgets/libephywidgets.la \
+	$(top_builddir)/lib/libephymisc.la \
+	$(top_builddir)/lib/egg/libegg.la \
 	$(DEPENDENCIES_LIBS) 
 
+if ENABLE_NSS
+CFLAGS += \
+    $(NSS_CFLAGS)
+LDADD += \
+    $(NSS_LIBS)
+endif
+
+if ENABLE_NSS
+CFLAGS += \
+    $(SEED_CFLAGS)
+LDADD += \
+    $(SEED_LIBS)
+endif
+
 testephysearchentry_SOURCES = \
 	testephysearchentry.c
-testephysearchentry_LDADD = \
-	$(top_builddir)/lib/widgets/libephywidgets.la \
-	$(DEPENDENCIES_LIBS) 
 
 testephylocationentry_SOURCES = \
 	testephylocationentry.c
-testephylocationentry_LDADD = \
-	$(top_builddir)/embed/libephyembed.la \
-	$(top_builddir)/lib/widgets/libephywidgets.la \
-	$(top_builddir)/lib/egg/libegg.la \
-	$(top_builddir)/lib/libephymisc.la \
-	$(DEPENDENCIES_LIBS) 
 
 testephyzoomcontrol_SOURCES = \
 	testephyzoomcontrol.c
-testephyzoomcontrol_LDADD = \
-	$(top_builddir)/lib/widgets/libephywidgets.la \
-	$(top_builddir)/lib/libephymisc.la \
-	$(DEPENDENCIES_LIBS)



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