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.

---
 libdimensionxx/Makefile.am         | 4 ++--
 libdimensionxx/dimensionxx.hpp     | 2 --
 libdimensionxx/dimensionxx/png.hpp | 2 +-
 libdimensionxx/png.cpp             | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'libdimensionxx')

diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am
index 74eb03b..862f72c 100644
--- a/libdimensionxx/Makefile.am
+++ b/libdimensionxx/Makefile.am
@@ -19,7 +19,7 @@
 
 nobase_include_HEADERS = dimensionxx.hpp dimensionxx/canvas.hpp dimensionxx/color.hpp dimensionxx/cookie.hpp dimensionxx/geometry.hpp dimensionxx/png.hpp
 
-INCLUDES = -I../libdimension -I../libdimension-png
+INCLUDES = -I../libdimension
 
 lib_LTLIBRARIES = libdimensionxx.la
 
@@ -32,4 +32,4 @@ else
 endif
 
 libdimensionxx_la_LDFLAGS = -version-info 0:0:0
-libdimensionxx_la_LIBADD  = ../libdimension/libdimension.la ../libdimension-png/libdimension-png.la
+libdimensionxx_la_LIBADD  = ../libdimension/libdimension.la
diff --git a/libdimensionxx/dimensionxx.hpp b/libdimensionxx/dimensionxx.hpp
index 7714f73..bfa0b06 100644
--- a/libdimensionxx/dimensionxx.hpp
+++ b/libdimensionxx/dimensionxx.hpp
@@ -29,8 +29,6 @@
 #include <dimensionxx/geometry.hpp>
 #include <dimensionxx/color.hpp>
 #include <dimensionxx/canvas.hpp>
-
-// libdimension-png wrapper
 #include <dimensionxx/png.hpp>
 
 #endif /* DIMENSIONXX_HPP */
diff --git a/libdimensionxx/dimensionxx/png.hpp b/libdimensionxx/dimensionxx/png.hpp
index c14b25f..07d7c18 100644
--- a/libdimensionxx/dimensionxx/png.hpp
+++ b/libdimensionxx/dimensionxx/png.hpp
@@ -21,7 +21,7 @@
 #ifndef DIMENSIONXX_PNG_HPP
 #define DIMENSIONXX_PNG_HPP
 
-// C++ wrapper for libdimension-png.  PNG_Canvas derives from Canvas.
+// C++ wrapper for libdimension PNG support.  PNG_Canvas derives from Canvas.
 
 #include <istream>
 #include <ostream>
diff --git a/libdimensionxx/png.cpp b/libdimensionxx/png.cpp
index 2d1d276..029e431 100644
--- a/libdimensionxx/png.cpp
+++ b/libdimensionxx/png.cpp
@@ -19,7 +19,6 @@
  *************************************************************************/
 
 #include "dimensionxx.hpp"
-#include "../libdimension-png/dimension-png.h"
 #include <cstdio>
 #include <stdexcept>
 
-- 
cgit v1.2.3