aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@src.gnome.org>2008-09-29 13:52:40 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2008-09-29 13:52:40 +0800
commita57cdc7eaabdb5e148cbb67a3a27acc4dce764ec (patch)
treed2401b1daaf6a636acd3d9e6355ac72a0133958d
parent9c4b573fa79495d2b577e2a5776c7e5783004e2e (diff)
downloadgsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar.gz
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar.bz2
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar.lz
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar.xz
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.tar.zst
gsoc2013-epiphany-a57cdc7eaabdb5e148cbb67a3a27acc4dce764ec.zip
Revert "Makefile fixes."
This reverts commit 58afaf81fbf64dfcb779ef2e7531afb4c11693e1. svn path=/trunk/; revision=8551
-rw-r--r--tests/Makefile.am40
1 files changed, 13 insertions, 27 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8e33533e..809121483 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,40 +1,26 @@
-NULL =
-
noinst_PROGRAMS = \
testephysearchentry \
- testephyiconentry \
- $(NULL)
-
-testephysearchentry_SOURCES = \
- testephysearchentry.c \
- $(NULL)
+ testephyiconentry
-testephysearchentry_CPPFLAGS = \
- -I$(top_srcdir)/lib/widgets \
- -I$(top_builddir)/lib/widgets \
- $(AM_CPPFLAGS)
+INCLUDES = \
+ -I$(top_builddir)/lib/widgets
-testephysearchentry_CFLAGS = \
+CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
$(AM_CFLAGS)
+LDADD = \
+ $(DEPENDENCIES_LIBS)
+
+testephysearchentry_SOURCES = \
+ testephysearchentry.c
testephysearchentry_LDADD = \
$(top_builddir)/lib/widgets/libephywidgets.la \
- $(DEPENDENCIES_LIBS)
+ $(DEPENDENCIES_LIBS)
testephyiconentry_SOURCES = \
- testephyiconentry.c \
- $(NULL)
-
-testephyiconentry_CPPFLAGS = \
- -I$(top_srcdir)/lib/widgets \
- -I$(top_builddir)/lib/widgets \
- $(AM_CPPFLAGS)
-
-testephyiconentry_CFLAGS = \
- $(DEPENDENCIES_CFLAGS) \
- $(AM_CFLAGS)
-
+ testephyiconentry.c
testephyiconentry_LDADD = \
$(top_builddir)/lib/widgets/libephywidgets.la \
- $(DEPENDENCIES_LIBS)
+ $(DEPENDENCIES_LIBS)
+