59 files changed, 36 insertions, 89 deletions
diff --git a/.gitignore b/.gitignore
index f202c53..62104f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ Makefile
 Makefile.in
 
 # Documentation files created by make
-/doc/libdimension
+/*/doc
 Doxyfile
 
 # pkg-config files
@@ -33,13 +33,13 @@ Doxyfile
 /dimension/lexer.c
 
 # Files created by `make check'
-/tests/*/*-test
-/tests/*/*.png
-/tests/*/*.log
+/*/tests/*-test
+/*/tests/*.png
+/*/tests/*.log
 
 # Files created by `make bench'
-/bench/*/bench-*
-/bench/*/*.png
+/*/bench/bench-*
+/*/bench/*.png
 
 # Files and folders created by libtool
 .libs/
diff --git a/HACKING b/HACKING
index d57be49..3b613ab 100644
--- a/HACKING
+++ b/HACKING
@@ -8,8 +8,8 @@ Tokenizing:          dimension/lexer.l
 Language directives: dimension/tokenize.c
 Parsing:             dimension/common.rules
 Extra parsing stuff: dimension/{common,grammar,directives}.*
-Tests:               tests/dimension/*.{pov,sh}
-Benchmarks:          bench/dimension/*.{sh,pov}
+Tests:               dimension/tests/*.{pov,sh}
+Benchmarks:          dimension/bench/*.{sh,pov}
 
 Library (LGPLv3):
 =================
@@ -20,5 +20,5 @@ API:                   libdimension/dimension.h, libdimension/dimension/*.h
 Ray tracing algorithm: libdimension/raytrace.c
 Bounding hierarchy:    libdimension/prtree.{c,h}
 Library internals:     libdimension/dimension-impl.h and its #includes
-Tests:                 tests/libdimension/*.{c,cpp}
-Benchmarks:            bench/libdimension/*.c
+Tests:                 libdimension/tests/*.{c,cpp}
+Benchmarks:            libdimension/bench/*.c
diff --git a/Makefile.am b/Makefile.am
index 44cbc86..898a0c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,15 +19,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libdimension                                                         \
-          dimension                                                            \
-          tests                                                                \
-          bench                                                                \
-          doc
+          dimension
 
 EXTRA_DIST = autogen.sh
 
 bench: all-recursive
-	cd bench && $(MAKE) $(AM_MAKEFLAGS) bench
+	cd libdimension && $(MAKE) $(AM_MAKEFLAGS) bench
+	cd dimension && $(MAKE) $(AM_MAKEFLAGS) bench
 
 doc:
 	cd libdimension && $(MAKE) $(AM_MAKEFLAGS) doc
diff --git a/bench/Makefile.am b/bench/Makefile.am
deleted file mode 100644
index 8404c22..0000000
--- a/bench/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-###########################################################################
-## Copyright (C) 2009-2010 Tavian Barnes <tavianator@tavianator.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/>. ##
-###########################################################################
-
-SUBDIRS = libdimension dimension
-
-bench: all-recursive
-	cd libdimension && $(MAKE) $(AM_MAKEFLAGS) bench
-	cd dimension && $(MAKE) $(AM_MAKEFLAGS) bench
-
-.PHONY: bench
diff --git a/configure.ac b/configure.ac
index 66833e3..e8e8b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,13 +170,10 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([Makefile
                  libdimension/Makefile
                  libdimension/Doxyfile
+                 libdimension/bench/Makefile
                  libdimension/libdimension.pc
+                 libdimension/tests/Makefile
                  dimension/Makefile
-                 tests/Makefile
-                 tests/libdimension/Makefile
-                 tests/dimension/Makefile
-                 bench/Makefile
-                 bench/libdimension/Makefile
-                 bench/dimension/Makefile
-                 doc/Makefile])
+                 dimension/bench/Makefile
+                 dimension/tests/Makefile])
 AC_OUTPUT
diff --git a/dimension/Makefile.am b/dimension/Makefile.am
index 4eaf64a..72aaad9 100644
--- a/dimension/Makefile.am
+++ b/dimension/Makefile.am
@@ -17,6 +17,9 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>. ##
 ###########################################################################
 
+SUBDIRS = bench                                                                \
+          tests
+
 # Make dmnsn_error() backtraces useful
 AM_LDFLAGS = -rdynamic
 
@@ -78,3 +81,8 @@ dimension_SOURCES = directives.y                                               \
                     y.tab.h
 dimension_LDADD   = $(top_builddir)/libdimension/libdimension.la
 dimension_LDFLAGS = $(AM_LDFLAGS)
+
+bench: all-recursive
+	cd bench && $(MAKE) $(AM_MAKEFLAGS) bench
+
+.PHONY: bench
diff --git a/bench/dimension/Makefile.am b/dimension/bench/Makefile.am
index e7fe03f..e7fe03f 100644
--- a/bench/dimension/Makefile.am
+++ b/dimension/bench/Makefile.am
diff --git a/bench/dimension/bench.pov b/dimension/bench/bench.pov
index a4f632f..a4f632f 100644
--- a/bench/dimension/bench.pov
+++ b/dimension/bench/bench.pov
diff --git a/bench/dimension/parse.sh b/dimension/bench/parse.sh
index b7db055..b7db055 100755
--- a/bench/dimension/parse.sh
+++ b/dimension/bench/parse.sh
diff --git a/bench/dimension/render.sh b/dimension/bench/render.sh
index b661e53..b661e53 100755
--- a/bench/dimension/render.sh
+++ b/dimension/bench/render.sh
diff --git a/bench/dimension/tokenize.sh b/dimension/bench/tokenize.sh
index 1d833d5..1d833d5 100755
--- a/bench/dimension/tokenize.sh
+++ b/dimension/bench/tokenize.sh
diff --git a/tests/dimension/Makefile.am b/dimension/tests/Makefile.am
index c54bcd4..c54bcd4 100644
--- a/tests/dimension/Makefile.am
+++ b/dimension/tests/Makefile.am
diff --git a/tests/dimension/arithexp.pov b/dimension/tests/arithexp.pov
index d38b13a..d38b13a 100644
--- a/tests/dimension/arithexp.pov
+++ b/dimension/tests/arithexp.pov
diff --git a/tests/dimension/arithexp.sh b/dimension/tests/arithexp.sh
index e46ab04..e46ab04 100755
--- a/tests/dimension/arithexp.sh
+++ b/dimension/tests/arithexp.sh
diff --git a/tests/dimension/csg.pov b/dimension/tests/csg.pov
index 357fd7b..357fd7b 100644
--- a/tests/dimension/csg.pov
+++ b/dimension/tests/csg.pov
diff --git a/tests/dimension/csg.sh b/dimension/tests/csg.sh
index b57389d..b57389d 100755
--- a/tests/dimension/csg.sh
+++ b/dimension/tests/csg.sh
diff --git a/tests/dimension/demo.pov b/dimension/tests/demo.pov
index 91be9d2..91be9d2 100644
--- a/tests/dimension/demo.pov
+++ b/dimension/tests/demo.pov
diff --git a/tests/dimension/demo.sh b/dimension/tests/demo.sh
index 233b880..233b880 100755
--- a/tests/dimension/demo.sh
+++ b/dimension/tests/demo.sh
diff --git a/tests/dimension/directives.inc b/dimension/tests/directives.inc
index a3dadb3..a3dadb3 100644
--- a/tests/dimension/directives.inc
+++ b/dimension/tests/directives.inc
diff --git a/tests/dimension/directives.pov b/dimension/tests/directives.pov
index 5c3cfa3..5c3cfa3 100644
--- a/tests/dimension/directives.pov
+++ b/dimension/tests/directives.pov
diff --git a/tests/dimension/directives.sh b/dimension/tests/directives.sh
index 9e3974a..9e3974a 100755
--- a/tests/dimension/directives.sh
+++ b/dimension/tests/directives.sh
diff --git a/tests/dimension/integer-overflow.pov b/dimension/tests/integer-overflow.pov
index a063fab..a063fab 100644
--- a/tests/dimension/integer-overflow.pov
+++ b/dimension/tests/integer-overflow.pov
diff --git a/tests/dimension/integer-overflow.sh b/dimension/tests/integer-overflow.sh
index 0e1f03e..0e1f03e 100755
--- a/tests/dimension/integer-overflow.sh
+++ b/dimension/tests/integer-overflow.sh
diff --git a/tests/dimension/invalid-macro.pov b/dimension/tests/invalid-macro.pov
index 9906da4..9906da4 100644
--- a/tests/dimension/invalid-macro.pov
+++ b/dimension/tests/invalid-macro.pov
diff --git a/tests/dimension/invalid-macro.sh b/dimension/tests/invalid-macro.sh
index cf6f353..cf6f353 100755
--- a/tests/dimension/invalid-macro.sh
+++ b/dimension/tests/invalid-macro.sh
diff --git a/tests/dimension/labels.pov b/dimension/tests/labels.pov
index 369e1fd..369e1fd 100644
--- a/tests/dimension/labels.pov
+++ b/dimension/tests/labels.pov
diff --git a/tests/dimension/labels.sh b/dimension/tests/labels.sh
index 47365bd..47365bd 100755
--- a/tests/dimension/labels.sh
+++ b/dimension/tests/labels.sh
diff --git a/tests/dimension/numeric.pov b/dimension/tests/numeric.pov
index dbf3c19..dbf3c19 100644
--- a/tests/dimension/numeric.pov
+++ b/dimension/tests/numeric.pov
diff --git a/tests/dimension/numeric.sh b/dimension/tests/numeric.sh
index c5e7c93..c5e7c93 100755
--- a/tests/dimension/numeric.sh
+++ b/dimension/tests/numeric.sh
diff --git a/tests/dimension/punctuation.pov b/dimension/tests/punctuation.pov
index d61db25..d61db25 100644
--- a/tests/dimension/punctuation.pov
+++ b/dimension/tests/punctuation.pov
diff --git a/tests/dimension/punctuation.sh b/dimension/tests/punctuation.sh
index 6990657..6990657 100755
--- a/tests/dimension/punctuation.sh
+++ b/dimension/tests/punctuation.sh
diff --git a/tests/dimension/strings.pov b/dimension/tests/strings.pov
index eafe1ba..eafe1ba 100644
--- a/tests/dimension/strings.pov
+++ b/dimension/tests/strings.pov
diff --git a/tests/dimension/strings.sh b/dimension/tests/strings.sh
index 1f5f4f9..1f5f4f9 100755
--- a/tests/dimension/strings.sh
+++ b/dimension/tests/strings.sh
diff --git a/tests/dimension/tbuffer-overlap.pov b/dimension/tests/tbuffer-overlap.pov
index 872b124..872b124 100644
--- a/tests/dimension/tbuffer-overlap.pov
+++ b/dimension/tests/tbuffer-overlap.pov
diff --git a/tests/dimension/tbuffer-overlap.sh b/dimension/tests/tbuffer-overlap.sh
index bc3126d..bc3126d 100755
--- a/tests/dimension/tbuffer-overlap.sh
+++ b/dimension/tests/tbuffer-overlap.sh
diff --git a/tests/dimension/transformations.pov b/dimension/tests/transformations.pov
index 312445d..312445d 100644
--- a/tests/dimension/transformations.pov
+++ b/dimension/tests/transformations.pov
diff --git a/tests/dimension/transformations.sh b/dimension/tests/transformations.sh
index 727bf3b..727bf3b 100755
--- a/tests/dimension/transformations.sh
+++ b/dimension/tests/transformations.sh
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 928bb0f..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-###########################################################################
-## Copyright (C) 2009-2010 Tavian Barnes <tavianator@tavianator.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/>. ##
-###########################################################################
diff --git a/libdimension/Doxyfile.in b/libdimension/Doxyfile.in
index 23d7bfb..145bd15 100644
--- a/libdimension/Doxyfile.in
+++ b/libdimension/Doxyfile.in
@@ -1,7 +1,7 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = libdimension
 PROJECT_NUMBER         = @VERSION@
-OUTPUT_DIRECTORY       = @top_builddir@/doc/libdimension
+OUTPUT_DIRECTORY       = @top_builddir@/libdimension/doc
 OUTPUT_LANGUAGE        = English
 FULL_PATH_NAMES        = YES
 OPTIMIZE_OUTPUT_FOR_C  = YES
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index 4d4f58e..0a134b1 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -17,6 +17,9 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>. ##
 ###########################################################################
 
+SUBDIRS = bench                                                                \
+          tests
+
 # Make dmnsn_error() backtraces useful
 AM_LDFLAGS = -rdynamic
 
@@ -130,6 +133,12 @@ if PROFILE
 libdimension_la_SOURCES += profile.c
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libdimension.pc
+
+bench: all-recursive
+	cd bench && $(MAKE) $(AM_MAKEFLAGS) bench
+
 clean-local: clean-docs
 
 doc:
@@ -137,5 +146,4 @@ doc:
 clean-docs:
 	rm -rf $(top_builddir)/doc/libdimension
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libdimension.pc
+.PHONY: bench doc
diff --git a/bench/libdimension/Makefile.am b/libdimension/bench/Makefile.am
index 353acb3..353acb3 100644
--- a/bench/libdimension/Makefile.am
+++ b/libdimension/bench/Makefile.am
diff --git a/bench/libdimension/array.c b/libdimension/bench/array.c
index 3fe0c83..3fe0c83 100644
--- a/bench/libdimension/array.c
+++ b/libdimension/bench/array.c
diff --git a/bench/libdimension/geometry.c b/libdimension/bench/geometry.c
index 4b77c9b..4b77c9b 100644
--- a/bench/libdimension/geometry.c
+++ b/libdimension/bench/geometry.c
diff --git a/bench/libdimension/polynomial.c b/libdimension/bench/polynomial.c
index 0313060..0313060 100644
--- a/bench/libdimension/polynomial.c
+++ b/libdimension/bench/polynomial.c
diff --git a/bench/libdimension/prtree.c b/libdimension/bench/prtree.c
index b6f778a..b6f778a 100644
--- a/bench/libdimension/prtree.c
+++ b/libdimension/bench/prtree.c
diff --git a/tests/libdimension/Makefile.am b/libdimension/tests/Makefile.am
index 6b5f8ca..6b5f8ca 100644
--- a/tests/libdimension/Makefile.am
+++ b/libdimension/tests/Makefile.am
diff --git a/tests/libdimension/cxx.cpp b/libdimension/tests/cxx.cpp
index 7405502..7405502 100644
--- a/tests/libdimension/cxx.cpp
+++ b/libdimension/tests/cxx.cpp
diff --git a/tests/libdimension/display-stubs.c b/libdimension/tests/display-stubs.c
index e3fb99e..e3fb99e 100644
--- a/tests/libdimension/display-stubs.c
+++ b/libdimension/tests/display-stubs.c
diff --git a/tests/libdimension/display.c b/libdimension/tests/display.c
index d4e2a1c..d4e2a1c 100644
--- a/tests/libdimension/display.c
+++ b/libdimension/tests/display.c
diff --git a/tests/libdimension/error.c b/libdimension/tests/error.c
index 5a4d7fd..5a4d7fd 100644
--- a/tests/libdimension/error.c
+++ b/libdimension/tests/error.c
diff --git a/tests/libdimension/gl.c b/libdimension/tests/gl.c
index 8d93cf5..8d93cf5 100644
--- a/tests/libdimension/gl.c
+++ b/libdimension/tests/gl.c
diff --git a/tests/libdimension/png.c b/libdimension/tests/png.c
index 328ee36..328ee36 100644
--- a/tests/libdimension/png.c
+++ b/libdimension/tests/png.c
diff --git a/tests/libdimension/polynomial.c b/libdimension/tests/polynomial.c
index 5632b49..5632b49 100644
--- a/tests/libdimension/polynomial.c
+++ b/libdimension/tests/polynomial.c
diff --git a/tests/libdimension/prtree.c b/libdimension/tests/prtree.c
index cb36153..cb36153 100644
--- a/tests/libdimension/prtree.c
+++ b/libdimension/tests/prtree.c
diff --git a/tests/libdimension/render.c b/libdimension/tests/render.c
index 5b03423..5b03423 100644
--- a/tests/libdimension/render.c
+++ b/libdimension/tests/render.c
diff --git a/tests/libdimension/tests.h b/libdimension/tests/tests.h
index d61e442..d61e442 100644
--- a/tests/libdimension/tests.h
+++ b/libdimension/tests/tests.h
diff --git a/tests/libdimension/warning-as-error.c b/libdimension/tests/warning-as-error.c
index ce274d3..ce274d3 100644
--- a/tests/libdimension/warning-as-error.c
+++ b/libdimension/tests/warning-as-error.c
diff --git a/tests/libdimension/warning.c b/libdimension/tests/warning.c
index aecedd5..aecedd5 100644
--- a/tests/libdimension/warning.c
+++ b/libdimension/tests/warning.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 9bcd2fd..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-###########################################################################
-## Copyright (C) 2009-2010 Tavian Barnes <tavianator@tavianator.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/>. ##
-###########################################################################
-
-SUBDIRS = libdimension dimension