diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-11 15:49:09 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-11 15:49:09 -0400 |
| commit | de5b8bce37f2ddb87fca7ae6b844eec7fbbbc7e9 (patch) | |
| tree | 9d1d49b0b786518457a8cb6b226463955b9110fc /test | |
| parent | 66f0d56a8a2c8dd3b4678d495d5652bfdfd690ea (diff) | |
Makefile.am cleanup
Use a common build/Makefile.am.common file.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 13 | ||||
| -rw-r--r-- | test/pdiff/Makefile.am | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index d83e9c1a4..1527d1497 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,9 @@ +include $(top_srcdir)/build/Makefile.am.common + SUBDIRS=pdiff . # Here are all the tests that are run unconditionally -TESTS = \ +TESTS += \ a1-image-sample$(EXEEXT) \ a1-mask$(EXEEXT) \ a1-traps-sample$(EXEEXT) \ @@ -742,7 +744,7 @@ REFERENCE_IMAGES = \ xlib-surface-source-ref.png \ zero-alpha-ref.png -EXTRA_DIST = \ +EXTRA_DIST += \ 6x13.pcf \ make-html.pl \ romedalen.png \ @@ -829,9 +831,6 @@ check-local: done; \ fi -check_PROGRAMS = -EXTRA_PROGRAMS = - AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/pdiff \ @@ -840,7 +839,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src \ $(CAIRO_CFLAGS) -EXTRA_LTLIBRARIES = libcairotest.la +EXTRA_LTLIBRARIES += libcairotest.la libcairotest_la_SOURCES =\ buffer-diff.c \ @@ -910,7 +909,7 @@ VALGRIND_FLAGS = \ --tool=memcheck --suppressions=$(srcdir)/.valgrind-suppressions \ --leak-check=yes --show-reachable=yes $(EXTRA_VALGRIND_FLAGS) -CLEANFILES = \ +CLEANFILES += \ valgrind-log \ index.html \ ref.hash \ diff --git a/test/pdiff/Makefile.am b/test/pdiff/Makefile.am index cc793284f..73098da78 100644 --- a/test/pdiff/Makefile.am +++ b/test/pdiff/Makefile.am @@ -1,5 +1,7 @@ -EXTRA_PROGRAMS = perceptualdiff -EXTRA_DIST = gpl.txt +include $(top_srcdir)/build/Makefile.am.common + +EXTRA_PROGRAMS += perceptualdiff +EXTRA_DIST += gpl.txt noinst_LTLIBRARIES = libpdiff.la libpdiff_la_SOURCES = \ @@ -15,7 +17,3 @@ perceptualdiff_SOURCES = \ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(CAIRO_CFLAGS) LDADD = libpdiff.la $(top_builddir)/src/libcairo.la -# -# Delete intermediate files as well -clean-local: - -${FIND} . -name '*.[is]' -print | ${XARGS} ${RM} |