summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-05-10 04:19:07 +0000
committerTavian Barnes <tavianator@gmail.com>2009-05-10 04:19:07 +0000
commit62cdc4181f536384c70254f1e5d8ab311cff368d (patch)
tree290d7a9f2d9a96de7d6667d8cc077fe62d6fbcea /tests
parentb59dc1d44fb9d56bf9c0949f6747badc5b5c2432 (diff)
downloaddimension-62cdc4181f536384c70254f1e5d8ab311cff368d.tar.xz
Merge libdimension-png into libdimension.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/png.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a11f18a..d4f94fc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,7 @@ check_PROGRAMS = warning error png pngxx
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = error
-INCLUDES = -I../libdimension -I../libdimension-png -I../libdimensionxx
+INCLUDES = -I../libdimension -I../libdimensionxx
warning_SOURCES = warning.c
warning_LDADD = ../libdimension/libdimension.la
@@ -30,7 +30,7 @@ error_SOURCES = error.c
error_LDADD = ../libdimension/libdimension.la
png_SOURCES = png.c
-png_LDADD = ../libdimension/libdimension.la ../libdimension-png/libdimension-png.la
+png_LDADD = ../libdimension/libdimension.la
pngxx_SOURCES = pngxx.cpp
pngxx_LDADD = ../libdimensionxx/libdimensionxx.la
diff --git a/tests/png.c b/tests/png.c
index 0ee7edb..5e7be2f 100644
--- a/tests/png.c
+++ b/tests/png.c
@@ -18,8 +18,7 @@
* <http://www.gnu.org/licenses/>. *
*************************************************************************/
-#include "../libdimension/dimension.h"
-#include "../libdimension-png/dimension-png.h"
+#include "dimension.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>