From 62cdc4181f536384c70254f1e5d8ab311cff368d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Sun, 10 May 2009 04:19:07 +0000
Subject: Merge libdimension-png into libdimension.

---
 tests/Makefile.am | 4 ++--
 tests/png.c       | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'tests')

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>
-- 
cgit v1.2.3