Merge libdimension-png into libdimension.

13 files changed, 12 insertions, 44 deletions

diff --git a/Makefile.am b/Makefile.am
index 4e9f6bc..11601b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,6 @@
 ###########################################################################
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libdimension libdimension-png libdimensionxx tests
+SUBDIRS = libdimension libdimensionxx tests
 
 EXTRA_DIST = autogen.sh
diff --git a/configure.ac b/configure.ac
index 8599feb..b68aa8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ dnl Generate Makefiles
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([Makefile
                  libdimension/Makefile
-                 libdimension-png/Makefile
                  libdimensionxx/Makefile
                  tests/Makefile])
 AC_OUTPUT
diff --git a/libdimension-png/Makefile.am b/libdimension-png/Makefile.am
deleted file mode 100644
index cd82a66..0000000
--- a/libdimension-png/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-###########################################################################
-## Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com>               ##
-##                                                                       ##
-## This file is part of The Dimension Build Suite.                       ##
-##                                                                       ##
-## The Dimension Build Suite is free software; you can redistribute it   ##
-## and/or modify it under the terms of the GNU General Public License as ##
-## published by the Free Software Foundation; either version 3 of the    ##
-## License, or (at your option) any later version.                       ##
-##                                                                       ##
-## The Dimension Build Suite is distributed in the hope that it will be  ##
-## useful, but WITHOUT ANY WARRANTY; without even the implied warranty   ##
-## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  ##
-## General Public License for more details.                              ##
-##                                                                       ##
-## You should have received a copy of the GNU General Public License     ##
-## along with this program.  If not, see <http://www.gnu.org/licenses/>. ##
-###########################################################################
-
-nobase_include_HEADERS = dimension-png.h
-
-lib_LTLIBRARIES = libdimension-png.la
-
-INCLUDES = -I../libdimension
-
-libdimension_png_la_SOURCES = dimension-png.h png.c
-libdimension_png_la_LDFLAGS = -version-info 0:0:0
-libdimension_png_la_LIBADD  = -lpng
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index ee3b6dc..7114b04 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -17,10 +17,10 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>. ##
 ###########################################################################
 
-nobase_include_HEADERS = dimension.h dimension/array.h dimension/canvas.h dimension/color.h dimension/error.h dimension/geometry.h
+nobase_include_HEADERS = dimension.h dimension/array.h dimension/canvas.h dimension/color.h dimension/error.h dimension/geometry.h dimension/png.h
 
 lib_LTLIBRARIES = libdimension.la
 
-libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c canvas.c color.c error.c geometry.c
+libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c canvas.c color.c error.c geometry.c png.c
 libdimension_la_LDFLAGS = -version-info 0:0:0
-libdimension_la_LIBADD  = -lm -lpthread
+libdimension_la_LIBADD  = -lm -lpthread -lpng
diff --git a/libdimension/dimension.h b/libdimension/dimension.h
index ac65f4c..50e1544 100644
--- a/libdimension/dimension.h
+++ b/libdimension/dimension.h
@@ -32,6 +32,7 @@ extern "C" {
 #include <dimension/color.h>
 #include <dimension/canvas.h>
 #include <dimension/object.h>
+#include <dimension/png.h>
 
 #ifdef __cplusplus
 }
diff --git a/libdimension-png/dimension-png.h b/libdimension/dimension/png.h
index 9ee55c3..9ee55c3 100644
--- a/libdimension-png/dimension-png.h
+++ b/libdimension/dimension/png.h
diff --git a/libdimension-png/png.c b/libdimension/png.c
index 7e9036f..5f45011 100644
--- a/libdimension-png/png.c
+++ b/libdimension/png.c
@@ -18,7 +18,7 @@
  * <http://www.gnu.org/licenses/>.                                       *
  *************************************************************************/
 
-#include "dimension-png.h"
+#include "dimension.h"
 #include <png.h>
 #include <setjmp.h>
 #include <arpa/inet.h>
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>
 
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>