--- milena/ChangeLog | 5 +++++ milena/tests/linear/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog index b7b4b98..98e1d16 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2009-05-29 Guillaume Lazzara lazzara@lrde.epita.fr + + * tests/linear/Makefile.am: fix conflict name between gaussian + directory and gaussian test. + 2009-05-29 Thierry Geraud thierry.geraud@lrde.epita.fr

Move to trash non-up-to-date image types. diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 1d6e969..b9c9a5d 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -10,13 +10,13 @@ check_PROGRAMS = \ convolve \ convolve_directional \ convolve_2x1d \ - gaussian \ + gaussian_ \ lap \ log \ sobel_2d

convolve_SOURCES = convolve.cc -gaussian_SOURCES = gaussian.cc +gaussian__SOURCES = gaussian.cc lap_SOURCES = lap.cc convolve_directional_SOURCES = convolve_directional.cc convolve_2x1d_SOURCES = convolve_2x1d.cc