* apps/morphers/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/subsampling/Makefile.am: Here. --- milena/ChangeLog | 9 +++++++++ milena/apps/morphers/Makefile.am | 9 ++------- milena/tests/fun/v2v/Makefile.am | 5 ++--- milena/tests/subsampling/Makefile.am | 3 +-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1765e50..de49a76 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-02-13 Roland Levillain <roland@lrde.epita.fr> + + Simplify more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT. + + * apps/morphers/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/subsampling/Makefile.am: + Here. + 2010-04-22 Roland Levillain <roland@lrde.epita.fr> Use AM_DEFAULT_SOURCE_EXT to simplify Milena's Makefiles. diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index 31a709e..55bfda5 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2011, 2012 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2012, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -32,18 +33,12 @@ noinst_PROGRAMS = \ noinst_HEADERS = recorder.hh lazy_recorder.hh -mask_channel_SOURCES = mask+channel.cc -recorder_SOURCES = recorder.cc recorder_bft_SOURCES = recorder-bft.cc image2d-skel.hh -recorder_wst_SOURCES = recorder-wst.cc -mask_recorder_SOURCES = mask+recorder.cc -lazy_recorder_SOURCES = lazy_recorder.cc EXTRA_DIST = iz_input.pbm if HAVE_MAGICKXX noinst_PROGRAMS += iz -iz_SOURCES = iz.cc iz_CPPFLAGS = $(AM_CPPFLAGS) $(MAGICKXX_CPPFLAGS) iz_LDFLAGS = $(AM_LDFLAGS) $(MAGICKXX_LDFLAGS) diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index 1b59245..6a67c47 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2012, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -26,7 +26,6 @@ check_PROGRAMS = \ if HAVE_QT check_PROGRAMS += qt_rgb_to_int_u -qt_rgb_to_int_u_SOURCES = qt_rgb_to_int_u.cc endif HAVE_QT diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am index 7e859b4..702adfc 100644 --- a/milena/tests/subsampling/Makefile.am +++ b/milena/tests/subsampling/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -21,7 +21,6 @@ check_PROGRAMS = \ antialiased -antialiased_SOURCES = antialiased.cc TESTS = $(check_PROGRAMS) -- 1.7.2.5