More fixes for "make dist".

Makefile.am

@@ -45,12 +45,7 @@ endif
 
 SUBDIRS = . $(PLE) $(PREPRO) src $(SALOME) $(DOCS) $(GUI) $(TSTS) $(NEPTUNE_CFD)
 
-AUX_DIST = \
-m4/libtool.m4 \
-m4/lt~obsolete.m4 \
-m4/ltoptions.m4 \
-m4/ltsugar.m4 \
-m4/ltversion.m4
+AUX_DIST =
 
 MAINTAINERCLEANFILES = \
 $(AUX_DIST) \
@@ -89,33 +84,12 @@ sbin/bootstrap \
 sbin/clean \
 sbin/rmb \
 config/cs_auto_flags.sh \
-config/code_saturne_build.cfg.in.in \
-m4/cs_blas.m4 \
-m4/cs_catalyst.m4 \
-m4/cs_ccm.m4 \
-m4/cs_cgns.m4 \
-m4/cs_coolprop.m4 \
-m4/cs_docs.m4 \
-m4/cs_eos.m4 \
-m4/cs_fortran.m4 \
-m4/cs_freesteam.m4 \
-m4/cs_hdf5.m4 \
-m4/cs_med.m4 \
-m4/cs_medcoupling.m4 \
-m4/cs_melissa.m4 \
-m4/cs_metis.m4 \
-m4/cs_modules.m4 \
-m4/cs_mpi.m4 \
-m4/cs_petsc.m4 \
-m4/cs_ple.m4 \
-m4/cs_salome.m4 \
-m4/cs_scotch.m4 \
-m4/cs_zlib.m4
+config/code_saturne_build.cfg.in.in
 
 # One adds several sub-directories with a dist-hook.
 # The reason for this trick is that
 # the number of extra files or patches can grow and change a lot.
-EXTRA_DIST += examples extras patches
+EXTRA_DIST += examples extras m4 patches
 
 nodist_pkginclude_HEADERS = \
 cs_config.h \

libple/Makefile.am

@@ -41,7 +41,6 @@ SUBDIRS = src pyple tests doc
 EXTRA_DIST = README.md \
              m4/ple_config_info.m4 \
              m4/ple_config_publ.m4 \
-             m4/ple_doc.m4 \
              m4/ple_mpi.m4 \
              m4/ple_mpi4py.m4 \
              m4/ple_types.m4 \

libple/pyple/Makefile.am

@@ -23,6 +23,8 @@
 
 if HAVE_MPI4PY
 
+EXTRA_DIST = pyple_coupler.py.in
+
 edit_python = sed \
 	-e 's|@mpi4pydir[@]|$(MPI4PY_PATH)|g'
 
@@ -33,18 +35,20 @@ pyple_coupler.py: Makefile
 	$(edit_python) $${srcdir}$@.in >$@.tmp;
 	mv $@.tmp $@
 
-
 AM_CPPFLAGS = $(MPI_CPPFLAGS)
 AM_CFLAGS = $(CFLAGS_DBG) $(CFLAGS_OPT)
 AM_LDFLAGS = $(MPI_LDFLAGS)
 
-pkgpython_PYTHON = __init__.py Coupling.py Init.py pyple_coupler.py
+pkgpython_PYTHON = __init__.py Coupling.py Init.py
+nodist_pkgpython_PYTHON = pyple_coupler.py
+
 pkgpyexec_LTLIBRARIES = libpyplecoupling.la
 libpyplecoupling_la_SOURCES = ple_coupling_wrapper.c
 libpyplecoupling_la_CFLAGS = $(MPI4PY_CFLAGS) $(PYTHON_CPPFLAGS) -I$(srcdir)/../src $(MPI_CPPFLAGS)
 libpyplecoupling_la_CPPFLAGS = $(MPI4PY_CFLAGS) $(PYTHON_CPPFLAGS) -I$(srcdir)/../src $(MPI_CPPFLAGS)
 libpyplecoupling_la_LDFLAGS = $(PYTHON_LIBS) $(PYTHON_EXTRA_LIBS)
 libpyplecoupling_la_LIBADD = $(top_builddir)/src/libple.la
 
+DISTCLEANFILES = pyple_coupler.py
 
 endif

sbin/bootstrap

@@ -20,7 +20,7 @@ for f in `ls ./build-aux` ; do
   esac
 done
 
-rm -rf m4/codeset.m4 m4/fcntl-o.m4 m4/gettext.m4 \
+rm -rf m4/codeset.m4 m4/extern-inline.m4 m4/fcntl-o.m4 m4/gettext.m4 \
        m4/glibc2.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 \
        m4/intl.m4 m4/intldir.m4 m4/intlmacosx.m4 m4/intmax.m4 \
        m4/inttypes-pri.m4 m4/inttypes_h.m4 m4/lcmessage.m4 \