* apps/graph-morpho/Makefile.am (samples_complex1d_SOURCES): Move io.hh and morpho.hh... (noinst_HEADERS): ...here (new variable). * apps/graph-morpho/samples-complex1d.cc: Remove dead code. --- milena/ChangeLog | 9 +++++++++ milena/apps/graph-morpho/Makefile.am | 5 +++-- milena/apps/graph-morpho/samples-complex1d.cc | 3 --- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fcb9b65..f308986 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-09-18 Roland Levillain <roland@lrde.epita.fr> + Fix apps/graph-morpho/Makefile.am. + + * apps/graph-morpho/Makefile.am + (samples_complex1d_SOURCES): Move io.hh and morpho.hh... + (noinst_HEADERS): ...here (new variable). + * apps/graph-morpho/samples-complex1d.cc: Remove dead code. + +2009-09-18 Roland Levillain <roland@lrde.epita.fr> + Add images to exercise ASFs on graph images. * apps/graph-morpho/zebra.pbm, diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 39fe29c..2f30a51 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -20,9 +20,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -noinst_PROGRAMS = samples-complex1d -samples_complex1d_SOURCES = samples-complex1d.cc io.hh morpho.hh +noinst_HEADERS = io.hh morpho.hh +noinst_PROGRAMS = samples-complex1d +samples_complex1d_SOURCES = samples-complex1d.cc TESTS = samples-complex1d # Graph images stored in 2D PBM files. diff --git a/milena/apps/graph-morpho/samples-complex1d.cc b/milena/apps/graph-morpho/samples-complex1d.cc index d3650a3..bc8f21b 100644 --- a/milena/apps/graph-morpho/samples-complex1d.cc +++ b/milena/apps/graph-morpho/samples-complex1d.cc @@ -42,9 +42,6 @@ int main() { using namespace mln; - // A graph is considered as a 1-complex here. - const unsigned dim = 1; - typedef topo::complex<dim> complex_t; /* Binary graph-based image with vertices aligned on a discrete 2D grid. Of course, it would have been better, simpler and faster to use a -- 1.6.4.2