* tests/core/image/Makefile.am: Move FreeImagePlus-related content... * trash/freeimageplus.mk: ...here. --- milena/ChangeLog | 8 ++++++++ milena/tests/core/image/Makefile.am | 8 -------- milena/trash/freeimageplus.mk | 9 +++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 milena/trash/freeimageplus.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index fccc066..cac6609 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Disable support for FreeImagePlus in Milena. + + * tests/core/image/Makefile.am: Move FreeImagePlus-related + content... + * trash/freeimageplus.mk: ...here. + +2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> + Improve conditional support for CFITSIO. * mln/io/all.hh [HAVE_CFITSIO]: Include mln/io/fits/all.hh. diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index e158ce0..49068ed 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -31,12 +31,4 @@ line_graph_image_SOURCES = line_graph_image.cc vertex_image_SOURCES = vertex_image.cc edge_image_SOURCES = edge_image.cc -# Tests depending on the FreeImagePlus library. -#if FREEIMAGEPLUS -# check_PROGRAMS += fi_adaptor -# fi_adaptor_SOURCES = fi_adaptor.cc -# fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) -# fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) -#endif - TESTS = $(check_PROGRAMS) diff --git a/milena/trash/freeimageplus.mk b/milena/trash/freeimageplus.mk new file mode 100644 index 0000000..fee203c --- /dev/null +++ b/milena/trash/freeimageplus.mk @@ -0,0 +1,9 @@ +## To be added to Makefile.am when support for FreeImagePlus is restored. + +# Tests depending on the FreeImagePlus library. +if HAVE_FREEIMAGEPLUS + check_PROGRAMS += fi_adaptor + fi_adaptor_SOURCES = fi_adaptor.cc + fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) + fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) +endif HAVE_FREEIMAGEPLUS -- 1.6.1.2