libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

patch-5: fixup Makefile.inc (was: HEAD: patch queue)


From: Ralf Wildenhues
Subject: patch-5: fixup Makefile.inc (was: HEAD: patch queue)
Date: Sun, 4 Dec 2005 16:32:39 +0100
User-agent: Mutt/1.5.11

* Ralf Wildenhues wrote on Sun, Dec 04, 2005 at 03:56:15PM CET:
> 
> - several (dunno how many yet) patches to fix the actual `make dist' 
>   stuff for clients.

This patch is more subtle than it looks.

First, we note that, in the subpackage case, we do not install
Makefile.inc.  Since we have to be correct for this case, remove
`Makefile.inc' from EXTRA_DIST.  Recursive mode does not use it either.
Since nonrecursive mode requires an Automake >= 1.7 anyway, and those
versions automatically distribute included makefile fragments, we don't
need to cater for that one either.

Second, lt~obsolete.m4 should be distributed from the toplevel, I
believe.  Darn, I forgot to mention that patch-4 does this.  Sorry.

Now the reordering: in a subsequent patch, libtoolize will start to
remove some entries from this list.  Automake will complain if you
remove the last one, leaving a dangling backslash.  So we don't do
that.

Cheers,
Ralf

        * libltdl/Makefile.inc (EXTRA_DIST): Remove Makefile.inc.
        Reorder other entries.

--- libltdl/Makefile.inc        2005-11-25 19:54:08.000000000 +0100
+++ libltdl/Makefile.inc        2005-12-04 12:19:54.000000000 +0100
@@ -117,15 +117,13 @@
 CLEANFILES            += $(LIBOBJS) $(LTLIBOBJS)
 
 EXTRA_DIST            += libltdl/COPYING.LIB \
+                         libltdl/configure.ac \
                          libltdl/Makefile.am \
+                         libltdl/aclocal.m4 \
                          libltdl/Makefile.in \
-                         libltdl/Makefile.inc \
-                         libltdl/README \
-                         libltdl/config-h.in \
                          libltdl/configure \
-                         libltdl/configure.ac \
-                         libltdl/aclocal.m4 \
-                         libltdl/m4/lt~obsolete.m4
+                         libltdl/config-h.in \
+                         libltdl/README
 
 ## --------------------------- ##
 ## Gnulib Makefile.am snippets ##




reply via email to

[Prev in Thread] Current Thread [Next in Thread]