* apps/papers/levillain.09.ismm/Makefile.am (data_DATA): Move seeds.pgm and m283-c.off... (dist_data_DATA): ...here. * tests/unit_test/Makefile.am (EXTRA_DIST): Add disabled_tests. --- milena/ChangeLog | 9 +++++++++ milena/apps/papers/levillain.09.ismm/Makefile.am | 4 ++-- milena/tests/unit_test/Makefile.am | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index da8264d..0a013de 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-04-21 Roland Levillain <roland@lrde.epita.fr> + Fix the Milena distribution. + + * apps/papers/levillain.09.ismm/Makefile.am + (data_DATA): Move seeds.pgm and m283-c.off... + (dist_data_DATA): ...here. + * tests/unit_test/Makefile.am (EXTRA_DIST): Add disabled_tests. + +2010-04-21 Roland Levillain <roland@lrde.epita.fr> + Fix Milena's unit tests generator's dependencies. * tests/unit_test/Makefile.am ($(srcdir)/unit-tests.mk): diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index b01c662..91be54c 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -31,10 +31,10 @@ complex_SOURCES = complex.cc # Input images. # FIXME: Move them to milena/img/? -data_DATA = seeds.pgm m283-c.off +dist_data_DATA = seeds.pgm m283-c.off # Output images. -data_DATA += lena-s.ppm graph-s.png m283-s.off +data_DATA = lena-s.ppm graph-s.png m283-s.off lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT) ./image2d$(EXEEXT) $< 1000 $@ diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index f7588b6..860b113 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -19,6 +20,8 @@ include $(top_srcdir)/milena/tests/tests.mk +EXTRA_DIST = disabled_tests + # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: -- 1.5.6.5