diff options
| author | Tavian Barnes <tavianator@gmail.com> | 2009-10-25 23:27:46 +0000 |
|---|---|---|
| committer | Tavian Barnes <tavianator@gmail.com> | 2009-10-25 23:27:46 +0000 |
| commit | fa8953f38f0f4b1a2ee3d0704c68750c38e5ec5f (patch) | |
| tree | 96d8520b91e348e2d92b8cf3234863d67e6c3130 | |
| parent | 5391e7cc0830a9a574fcb24ce86e4b2f37eef1eb (diff) | |
| download | dimension-fa8953f38f0f4b1a2ee3d0704c68750c38e5ec5f.tar.xz | |
Fix make distcheck.
Tests and benchmarks were using $(top_srcdir) instead of $(top_builddir) to
refer to libraries, and PNG files were not being cleaned.
| -rw-r--r-- | bench/libdimension/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/libdimension/Makefile.am | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bench/libdimension/Makefile.am b/bench/libdimension/Makefile.am index 609ecd5..8b124bc 100644 --- a/bench/libdimension/Makefile.am +++ b/bench/libdimension/Makefile.am @@ -22,13 +22,13 @@ INCLUDES = -I$(top_srcdir)/libdimension EXTRA_PROGRAMS = bench-array bench-geometry bench-kD_splay_tree bench_array_SOURCES = array.c -bench_array_LDADD = -lsandglass $(top_srcdir)/libdimension/libdimension.la +bench_array_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la bench_geometry_SOURCES = geometry.c -bench_geometry_LDADD = -lsandglass $(top_srcdir)/libdimension/libdimension.la +bench_geometry_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la bench_kD_splay_tree_SOURCES = kD_splay_tree.c -bench_kD_splay_tree_LDADD = -lsandglass $(top_srcdir)/libdimension/libdimension.la +bench_kD_splay_tree_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la bench: bench-array$(EXEEXT) bench-geometry$(EXEEXT) bench-kD_splay_tree$(EXEEXT) ./bench-array$(EXEEXT) diff --git a/tests/libdimension/Makefile.am b/tests/libdimension/Makefile.am index 07a4b8d..fe19ad4 100644 --- a/tests/libdimension/Makefile.am +++ b/tests/libdimension/Makefile.am @@ -28,8 +28,11 @@ check_PROGRAMS = error-test \ TESTS = $(check_PROGRAMS) XFAIL_TESTS = error-test +.PHONY: clean-local-png-test +clean-local: clean-local-png-test + libdimension_tests_la_SOURCES = tests.c tests.h -libdimension_tests_la_LIBADD = $(top_srcdir)/libdimension/libdimension.la +libdimension_tests_la_LIBADD = $(top_builddir)/libdimension/libdimension.la error_test_SOURCES = error.c error_test_LDADD = libdimension-tests.la @@ -42,6 +45,8 @@ kD_splay_tree_test_LDADD = libdimension-tests.la png_test_SOURCES = png.c png_test_LDADD = libdimension-tests.la +clean-local-png-test: + rm -f *.png gl_test_SOURCES = gl.c gl_test_LDADD = libdimension-tests.la |