Changes in lib/

Changes in lib/

[Eli Zaretskii]

As result of recent changes in the lib/ subdirectory,
autogen/Makefile.in (which reflects changes in lib/Makefile.in at
least on some Posix platform) acquired the following strange change:

    +am__libgnu_a_SOURCES_DIST = allocator.c careadlinkat.c dtoastr.c \
    +       gettext.h ignore-value.h verify.h
    +am__objects_1 =
     am_libgnu_a_OBJECTS = allocator.$(OBJEXT) careadlinkat.$(OBJEXT) \
    -       dtoastr.$(OBJEXT)
    +       dtoastr.$(OBJEXT) $(am__objects_1) $(am__objects_1)

Why is $(am__objects_1) mentioned twice in the last line?  That's
harmless as long as the value is empty, but what if it becomes
non-empty?

Putting .h files into lib_SOURCES? (was: Changes in lib/)

[Paul Eggert]

On 05/07/11 02:35, Eli Zaretskii wrote:
> As result of recent changes in the lib/ subdirectory,
> autogen/Makefile.in (which reflects changes in lib/Makefile.in at
> least on some Posix platform) acquired the following strange change:
> 
>     +am__libgnu_a_SOURCES_DIST = allocator.c careadlinkat.c dtoastr.c \
>     +       gettext.h ignore-value.h verify.h
>     +am__objects_1 =
>      am_libgnu_a_OBJECTS = allocator.$(OBJEXT) careadlinkat.$(OBJEXT) \
>     -       dtoastr.$(OBJEXT)
>     +       dtoastr.$(OBJEXT) $(am__objects_1) $(am__objects_1)
> 
> Why is $(am__objects_1) mentioned twice in the last line?  That's
> harmless as long as the value is empty, but what if it becomes
> non-empty?

I installed the following patch into gnulib to fix this glitch,
and this should be propagated into Emacs the next time someone
(probably me :-) does a "make sync-from-gnulib".

I'll CC: this to bug-gnulib, as it raises the more-general issue
of why we ever put gnulib's .h files into lib_SOURCES.

From e7e83b6713e646fce656245afaaa8985b6cfb634 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 May 2011 14:29:30 -0700
Subject: [PATCH] ignore-value, verify: Omit include files from lib_SOURCES.

* modules/ignore-value, modules/verify (Makefile.am):
Don't put ignore-value.h, or verify.h, into lib_SOURCES, as
that leads Automake to duplicate use of am__objects_... variables
in Makefile.in.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00257.html>.
---
 ChangeLog            |    9 +++++++++
 modules/ignore-value |    1 -
 modules/verify       |    1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c84262b..67e7993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	ignore-value, verify: Omit include files from lib_SOURCES.
+	* modules/ignore-value, modules/verify (Makefile.am):
+	Don't put ignore-value.h, or verify.h, into lib_SOURCES, as
+	that leads Automake to duplicate use of am__objects_... variables
+	in Makefile.in.  See
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00257.html>.
+
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
 	fclose: Simplify autoconf macro.
diff --git a/modules/ignore-value b/modules/ignore-value
index 8d48863..9d00c1f 100644
--- a/modules/ignore-value
+++ b/modules/ignore-value
@@ -10,7 +10,6 @@ configure.ac:
 AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
-lib_SOURCES += ignore-value.h
 
 Include:
 "ignore-value.h"
diff --git a/modules/verify b/modules/verify
index eebb1cd..5216ce8 100644
--- a/modules/verify
+++ b/modules/verify
@@ -9,7 +9,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += verify.h
 
 Include:
 "verify.h"
-- 
1.7.4.4

Re: Putting .h files into lib_SOURCES?

[Bruno Haible]

Paul Eggert wrote:
> I'll CC: this to bug-gnulib, as it raises the more-general issue
> of why we ever put gnulib's .h files into lib_SOURCES.

Ralf Wildenhues answered this question on 2011-01-12 [1]:

  "things like 'make tags ctags cscope' etc. look at all _SOURCES files."

I never use these targets 'tags', 'ctags', 'cscope', so for me personally
it makes no difference whether .h files are added to lib_SOURCES or not.

But if we decide that .h files should be added to lib_SOURCES, I would vote
for gnulib-tool to do this automatically (like it automatically adds all
source files that are not otherwise mentioned to EXTRA_DIST).

Bruno

[1] http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00201.html
-- 
In memoriam The victims of the Skelani massacre <http://books.google.de/books?id=nltdtAo38K0C&pg=PA41&lpg=PA41&source=bl&ots=DX2VTN1nga&sig=d_BXUZM0I81hZtfrSBA3392p-KY&hl=de&ei=JHy6TcGTCYmLswbpsrDzBQ&sa=X&oi=book_result&ct=result&resnum=1&ved=0CBkQ6AEwAA#v=onepage&q&f=false>