Re: libltdl/Makefile.in DIST_COMMON issue

[Ralf Wildenhues]

Me again.

* Ralf Wildenhues wrote on Wed, Sep 28, 2005 at 06:05:48PM CEST:
> Ugly issue.  :-/
> 
> libtool/libltdl/Makefile.in created by automake-1.9 contains
> 
> DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
>         $(am__ltdlinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
>         $(srcdir)/Makefile.in $(srcdir)/config-h.in \
>         $(top_srcdir)/configure COPYING.LIB argz.c config/compile \
>         config/config.guess config/config.sub config/depcomp \
>         config/install-sh config/ltmain.sh config/mdate-sh \
>         config/missing config/texinfo.tex lt__dirent.c lt__strl.c
> 
> but the subtree created by `libtoolize --ltdl' lacks
>   config/mdate-sh config/texinfo.tex
> (and we surely don't want to change that).  So a `make dist' in the
> client package will fail.

Scratch my last patch, it doesn't solve the problem.  autoreconf and
automatic rebuilding rules due to changed configure-dependencies will
not use the rule, so result in a broken Makefile.in anyway.

Next idea: use of a stamp file.  I don't actually know whether this
is good in all cases.  The idea I had before was to do the fixup during
`make install', but that is quite tricky, too, if you don't want to mess
with permissions nor write below $top_builddir.

OK to apply this one?

Cheers,
Ralf

         * Makefile.am (libltdl/stamp-mk): New rule to fix
         libltdl/Makefile.in to not distribute the auxiliary files that
        are not used by libltdl, so that packages that use
        `libtoolize --ltdl' can `make dist' successfully.
        (EXTRA_DIST): Distribute stamp-mk.
        (all-local): Depend on it.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.166
diff -u -r1.166 Makefile.am
--- Makefile.am 27 Sep 2005 10:03:49 -0000      1.166
+++ Makefile.am 29 Sep 2005 12:43:57 -0000
@@ -216,8 +217,18 @@
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am
        cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
 
+$(srcdir)/libltdl/stamp-mk: $(srcdir)/libltdl/Makefile.in
+       cd $(srcdir)/libltdl && \
+       sed -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
+           -e 's,config/mkinstalldirs,,' \
+         < Makefile.in > Makefile.inT && \
+       mv -f Makefile.inT Makefile.in
+       echo stamp > $@
+
+EXTRA_DIST += libltdl/stamp-mk
+
 # We want the libltdl files to be up to date as much as possible.
-all-local: $(srcdir)/libltdl/Makefile.in
+all-local: $(srcdir)/libltdl/stamp-mk
 
 
 ## -------- ##
@@ -414,7 +425,7 @@
          f=`echo "$$p" | sed 's|^.*/||'`; \
          echo " $(INSTALL_DATA) '$$f' '$(DESTDIR)$(aclocaldir)/$$f'"; \
          $(INSTALL_DATA) "$$f" "$(DESTDIR)$(aclocaldir)/$$f"; \
-       done; \
+       done
 ## install the helper scripts
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/config