* Makefile.am (dist-hook): Strip parts related to SCRIBO by default. Tag parts to be stripped by default with `<<lrde' and `>>'. * configure.ac: Likewise. --- ChangeLog | 9 +++++++++ Makefile.am | 24 ++++++++++++++++++++++++ configure.ac | 5 ++++- 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a34bb08..44f6b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-06-11 Roland Levillain <roland@lrde.epita.fr> + Do not distribute scribo/ by default. + + * Makefile.am (dist-hook): Strip parts related to SCRIBO by + default. + Tag parts to be stripped by default with `<<lrde' and `>>'. + * configure.ac: Likewise. + +2009-06-11 Roland Levillain <roland@lrde.epita.fr> + Add a script stripping parts of the distribution. * build-aux/strip-lrde: New. diff --git a/Makefile.am b/Makefile.am index 45a5954..b812d95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,11 @@ if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA +#<<lrde if ENABLE_SCRIBO SUBDIRS += scribo endif ENABLE_SCRIBO +#>> # Target shortcuts delegating the actual action to milena/Makefile. LOCAL_RECURSIVE_TARGETS = doc pretty-check tests @@ -38,3 +40,25 @@ $(LOCAL_RECURSIVE_TARGETS): # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += milena scribo + + +#<<lrde +# Unless Make variable MAINTAINER is set to `true' (e.g. by calling +# `make dist MAINTAINER=true'), do not distribute parts tagged `lrde' +# (see build-aux/strip-lrde). +# +# Remove any trace of olena/oln/lrde from the distribution and reset +# the GNU build system for the distdir layout. +dist-hook: + if test x$(MAINTAINER) != xtrue; then \ + $(top_srcdir)/build-aux/strip-lrde $(distdir)/configure.ac && \ + $(top_srcdir)/build-aux/strip-lrde $(distdir)/Makefile.am && \ + rm -rf $(distdir)/scribo && \ + ( \ + cd $(distdir); \ + set -evx; \ + autoreconf -f -v -i \ + find . -name autom4te.cache | xargs rm -rf \ + ) \ + fi +#>> diff --git a/configure.ac b/configure.ac index 706f02e..8c89918 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,9 @@ AC_ARG_ENABLE([all], enable_trimesh=yes with_swig=yes enable_swilena=yes +#<<lrde enable_scribo=yes +#>> enable_apps=yes enable_tools=yes ]) @@ -184,6 +186,7 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) +#<<lrde ## -------- ## ## Scribo. ## ## -------- ## @@ -212,7 +215,7 @@ AC_CONFIG_FILES([ scribo/tests/text/Makefile scribo/tests/unit_test/Makefile ]) - +#>> ## --------------- ## ## Configuration. ## -- 1.6.2.4