diff options
| -rw-r--r-- | libdimension/Makefile.am | 29 | ||||
| -rw-r--r-- | libdimensionxx/Makefile.am | 18 | ||||
| -rw-r--r-- | tests/Makefile.am | 15 |
3 files changed, 54 insertions, 8 deletions
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index d4d01ec..2bdc0e9 100644 --- a/libdimension/Makefile.am +++ b/libdimension/Makefile.am @@ -17,10 +17,35 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## ########################################################################### -nobase_include_HEADERS = dimension.h dimension/array.h dimension/camera.h dimension/canvas.h dimension/color.h dimension/cube.h dimension/error.h dimension/geometry.h dimension/png.h dimension/progress.h dimension/object.h dimension/scene.h dimension/sphere.h +nobase_include_HEADERS = dimension.h \ + dimension/array.h \ + dimension/camera.h \ + dimension/canvas.h \ + dimension/color.h \ + dimension/cube.h \ + dimension/error.h \ + dimension/geometry.h \ + dimension/png.h \ + dimension/progress.h \ + dimension/object.h \ + dimension/scene.h \ + dimension/sphere.h lib_LTLIBRARIES = libdimension.la -libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c camera.c canvas.c color.c cube.c error.c geometry.c png.c progress.c object.c raytrace.c scene.c sphere.c +libdimension_la_SOURCES = $(nobase_include_HEADERS) \ + array.c \ + camera.c \ + canvas.c \ + color.c \ + cube.c \ + error.c \ + geometry.c \ + png.c \ + progress.c \ + object.c \ + raytrace.c \ + scene.c \ + sphere.c libdimension_la_LDFLAGS = -version-info 0:0:0 libdimension_la_LIBADD = -lm -lpthread -lpng diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am index 0371435..6b53858 100644 --- a/libdimensionxx/Makefile.am +++ b/libdimensionxx/Makefile.am @@ -17,13 +17,27 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## ########################################################################### -nobase_include_HEADERS = dimensionxx.hpp dimensionxx/array.hpp dimensionxx/canvas.hpp dimensionxx/color.hpp dimensionxx/cookie.hpp dimensionxx/geometry.hpp dimensionxx/object.hpp dimensionxx/png.hpp dimensionxx/progress.hpp +nobase_include_HEADERS = dimensionxx.hpp \ + dimensionxx/array.hpp \ + dimensionxx/canvas.hpp \ + dimensionxx/color.hpp \ + dimensionxx/cookie.hpp \ + dimensionxx/geometry.hpp \ + dimensionxx/object.hpp \ + dimensionxx/png.hpp \ + dimensionxx/progress.hpp INCLUDES = -I../libdimension lib_LTLIBRARIES = libdimensionxx.la -libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) canvas.cpp color.cpp error.cpp object.cpp png.cpp progress.cpp +libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) \ + canvas.cpp \ + color.cpp \ + error.cpp \ + object.cpp \ + png.cpp \ + progress.cpp if FOPENCOOKIE libdimensionxx_la_SOURCES += cookie-fopencookie.cpp diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d09994..35ed3d1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,17 +17,24 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## ########################################################################### -check_LTLIBRARIES = libdimension-tests.la libdimensionxx-tests.la -check_PROGRAMS = warning error png pngxx raytrace +check_LTLIBRARIES = libdimension-tests.la \ + libdimensionxx-tests.la +check_PROGRAMS = warning \ + error \ + png \ + pngxx \ + raytrace TESTS = $(check_PROGRAMS) XFAIL_TESTS = error INCLUDES = -I../libdimension -I../libdimensionxx -libdimension_tests_la_SOURCES = tests.h tests.c +libdimension_tests_la_SOURCES = tests.h \ + tests.c libdimension_tests_la_LIBADD = ../libdimension/libdimension.la -libdimensionxx_tests_la_SOURCES = testsxx.hpp testsxx.cpp +libdimensionxx_tests_la_SOURCES = testsxx.hpp \ + testsxx.cpp libdimensionxx_tests_la_LIBADD = ../libdimensionxx/libdimensionxx.la warning_SOURCES = warning.c |