* Makefile.am (EXTRA_DIST): Remove tools, tools/area_flooding.cc and tools/seed2tiling.cc. Reindent. --- milena/ChangeLog | 8 ++++++ milena/Makefile.am | 64 +++++++++++++++++++++++---------------------------- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 51618ca..d5f79b1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-05-11 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Clean up Milena's top-level Makefile.am. + + * Makefile.am (EXTRA_DIST): Remove tools, tools/area_flooding.cc and + tools/seed2tiling.cc. + Reindent. + +2009-05-11 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Use conditional ENABLE_TRIMESH. * apps/statues/Makefile.am [ENABLE_TRIMESH]: Compile diff --git a/milena/Makefile.am b/milena/Makefile.am index a854381..e186158 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -30,44 +30,38 @@ regen-dist: $(srcdir)/headers.mk # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # +EXTRA_DIST = generate_dist_headers.sh $(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh cd $(srcdir) && ./generate_dist_headers.sh && chmod -w headers.mk include $(srcdir)/headers.mk -EXTRA_DIST = \ -img/README \ -img/fly.pbm \ -img/fly.pgm \ -img/fly.ppm \ -img/lena.pbm \ -img/lena.pgm \ -img/lena.ppm \ -img/lena_16.ppm \ -img/medium.pgm \ -img/medium.ppm \ -img/picasso.pbm \ -img/picasso.pgm \ -img/quite-small.pgm \ -img/small.pbm \ -img/small.pgm \ -img/small.ppm \ -img/squares-lc.pgm \ -img/squares.pgm \ -img/test.fits \ -img/tiny.pbm \ -img/tiny.pgm \ -img/tiny.ppm \ -img/toto.pbm - -EXTRA_DIST += \ -tests/img/test_rgb8.tif \ -tests/img/test_bw.tif \ -tests/img/test_gl.tif - -EXTRA_DIST += \ -generate_dist_headers.sh\ -tools \ -tools/area_flooding.cc \ -tools/seed2tiling.cc +EXTRA_DIST += \ + img/README \ + img/fly.pbm \ + img/fly.pgm \ + img/fly.ppm \ + img/lena.pbm \ + img/lena.pgm \ + img/lena.ppm \ + img/lena_16.ppm \ + img/medium.pgm \ + img/medium.ppm \ + img/picasso.pbm \ + img/picasso.pgm \ + img/quite-small.pgm \ + img/small.pbm \ + img/small.pgm \ + img/small.ppm \ + img/squares-lc.pgm \ + img/squares.pgm \ + img/test.fits \ + img/tiny.pbm \ + img/tiny.pgm \ + img/tiny.ppm \ + img/toto.pbm +EXTRA_DIST += \ + tests/img/test_rgb8.tif \ + tests/img/test_bw.tif \ + tests/img/test_gl.tif -- 1.6.1.2