* nodist-headers: New. * generate_dist_headers.sh: Prune the list of headers to distribute using file `nodist-headers'. * Makefile.am (EXTRA_DIST): Add nodist-headers. ($(srcdir)/headers.mk): Depend on nodist-headers. --- milena/ChangeLog | 10 +++++ milena/Makefile.am | 4 +- milena/generate_dist_headers.sh | 5 +++ milena/nodist-headers | 71 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 milena/nodist-headers diff --git a/milena/ChangeLog b/milena/ChangeLog index 462287a..589c80d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-06-12 Roland Levillain <roland@lrde.epita.fr> + Prevent generate_dist_headers.sh from distributing certain files. + + * nodist-headers: New. + * generate_dist_headers.sh: Prune the list of headers to + distribute using file `nodist-headers'. + * Makefile.am (EXTRA_DIST): Add nodist-headers. + ($(srcdir)/headers.mk): Depend on nodist-headers. + +2009-06-12 Roland Levillain <roland@lrde.epita.fr> + Simplify generate_dist_headers.sh in Milena. * generate_dist_headers.sh: Use a heredoc instead of multiple diff --git a/milena/Makefile.am b/milena/Makefile.am index 3c7269d..c498a7a 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -72,12 +72,12 @@ REGEN_SUBDIRS += doc tests regen-am: cd $(srcdir) && ./generate_dist_headers.sh -EXTRA_DIST = generate_dist_headers.sh +EXTRA_DIST = generate_dist_headers.sh nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # -$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh +$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh nodist-headers cd $(srcdir) && ./generate_dist_headers.sh include $(srcdir)/headers.mk diff --git a/milena/generate_dist_headers.sh b/milena/generate_dist_headers.sh index bf276d7..18ee545 100755 --- a/milena/generate_dist_headers.sh +++ b/milena/generate_dist_headers.sh @@ -8,7 +8,11 @@ export LC_ALL=C me=`basename $0` +# FIXME: OUTPUT and NODIST_HEADERS should be arguments of the script. output=headers.mk +nodist_headers=nodist-headers +test -f "$nodist_headers" \ + || { echo "$me: Cannot find \`$nodist_headers' in `pwd`."; exit 1; } echo "Generating $output..." >&2 rm -f "$output" @@ -20,6 +24,7 @@ EOF find mln -type f -a \( -name '*.hh' -o -name '*.hxx' \) \ | sort \ + | comm -23 - "$nodist_headers" \ | sed -e 's/$/ \\/g' >> headers.mk last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line diff --git a/milena/nodist-headers b/milena/nodist-headers new file mode 100644 index 0000000..f0e07b7 --- /dev/null +++ b/milena/nodist-headers @@ -0,0 +1,71 @@ +milena/mln/fun/meta/all.hh +milena/mln/fun/meta/blue.hh +milena/mln/fun/meta/essential.hh +milena/mln/fun/meta/first.hh +milena/mln/fun/meta/green.hh +milena/mln/fun/meta/hue.hh +milena/mln/fun/meta/inty.hh +milena/mln/fun/meta/lum.hh +milena/mln/fun/meta/red.hh +milena/mln/fun/meta/sat.hh +milena/mln/fun/meta/second.hh +milena/mln/fun/meta/to_enc.hh +mln/core/image/vmorph/fun_image.hh +mln/data/was.median.hh +mln/extract/all.hh +mln/extract/blue.hh +mln/extract/essential.hh +mln/extract/green.hh +mln/extract/hue.hh +mln/extract/lum.hh +mln/extract/red.hh +mln/extract/sat.hh +mln/fun/binary.hh +mln/fun/binary_param.hh +mln/fun/component/comp.hh +mln/fun/compose.hh +mln/fun/composition.hh +mln/fun/from_accu.hh +mln/fun/meta/all.hh +mln/fun/meta/blue.hh +mln/fun/meta/essential.hh +mln/fun/meta/first.hh +mln/fun/meta/green.hh +mln/fun/meta/hue.hh +mln/fun/meta/inty.hh +mln/fun/meta/lum.hh +mln/fun/meta/red.hh +mln/fun/meta/sat.hh +mln/fun/meta/second.hh +mln/fun/meta/to_enc.hh +mln/fun/param.hh +mln/fun/spe/binary.hh +mln/fun/spe/unary.hh +mln/fun/unary.hh +mln/fun/unary_param.hh +mln/fun/v2v/hsi_to_rgb.hh +mln/fun/v2v/hsl_to_rgb.hh +mln/fun/v2v/rgb_to_hsi.hh +mln/fun/v2v/rgb_to_hsl.hh +mln/linear/gaussian.hh +mln/linear/gaussian/filter.hh +mln/linear/gaussian/impl.hh +mln/linear/gaussian/internal/coefficients.hh +mln/linear/gaussian_1d.hh +mln/linear/gaussian_directional_2d.hh +mln/registration/all.hh +mln/registration/essential.hh +mln/registration/get_rot.hh +mln/registration/get_rtransf.hh +mln/registration/icp.hh +mln/registration/internal +mln/registration/internal/rms.hh +mln/registration/registration.hh +mln/trait/next/solve.hh +mln/trait/next/solve_binary.hh +mln/trait/next/solve_proxy.hh +mln/trait/next/solve_unary.hh +mln/value/hsi.hh +mln/value/hsl.hh +mln/value/shell.hh +mln/value/stack.hh -- 1.6.2.4