From 757132918cfcf7b7eb1b5c0ba187fce5632fd470 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 1 Nov 2004 09:55:34 +0000 Subject: [PATCH] * doc/automake.texi (LIBOBJS): Spelling and grammar corrections from Ralf Wildenhues. --- ChangeLog | 5 +++++ doc/automake.texi | 23 +++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5166c079..de304ad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-01 Alexandre Duret-Lutz + + * doc/automake.texi (LIBOBJS): Spelling and grammar corrections + from Ralf Wildenhues. + 2004-10-31 Alexandre Duret-Lutz * doc/automake.texi (LIBOBJS): Augment with an example setup. diff --git a/doc/automake.texi b/doc/automake.texi index 0bf67335..b08207a9 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3692,7 +3692,7 @@ target_LDADD = libmain.a libmisc.a @vindex LTALLOCA @vindex ALLOCA -The @code{$(LIBOBJS)} and @code{$(ALLOCA)} variables list objects +The @code{$(LIBOBJS)} and @code{$(ALLOCA)} variables list object files that should be compiled into the project to provide an implementation for functions that are missing or broken on the host system. They are substituted by @file{configure}. @@ -3711,7 +3711,7 @@ populate @code{$(LIBOBJS)}. Using these variables is very similar to doing conditional compilation using @code{AC_SUBST} variables, as described in @ref{Conditional -Sources}. That is, when building a program @code{$(LIBOBJS)} and +Sources}. That is, when building a program, @code{$(LIBOBJS)} and @code{$(ALLOCA)} should be added to the associated @samp{*_LDADD} variable, or to the @samp{*_LIBADD} variable when building a library. However there is no need to list the corresponding sources in @@ -3745,11 +3745,11 @@ AC_OUTPUT @cvindex AC_CONFIG_LIBOBJ_DIR -The @code{AC_CONFIG_LIBOBJ_DIR} tells Autoconf the source files of -these object files are to be found in the @file{lib/} directory. -Automake does not yet use this information; anyway it knows the source -files are expected to be in the directory where the @code{$(LIBOBJS)} -and @code{$(ALLOCA)} variables are used. +The @code{AC_CONFIG_LIBOBJ_DIR} tells Autoconf that the source files +of these object files are to be found in the @file{lib/} directory. +Automake does not yet use this information; it knows the source files +are expected to be in the directory where the @code{$(LIBOBJS)} and +@code{$(ALLOCA)} variables are used. The @file{lib/} directory should therefore contain @file{malloc.c}, @file{memcmp.c}, @file{strdup.c}, @file{alloca.c}. Here is its @@ -3790,13 +3790,12 @@ contains unprefixed object names, and for instance @file{malloc.$(OBJEXT)} is not buildable in the @file{src/} directory. (Actually if you try using @code{$(LIBOBJS)} in @file{src/}, Automake will require a copy of @file{malloc.c}, @file{memcmp.c}, -@file{strdup.c}, @file{alloca.c} here too.) +@file{strdup.c}, @file{alloca.c} in @file{src/} too.) Because @code{$(LIBOBJS)} and @code{$(ALLOCA)} contain object -filenames whose name end with @code{.$(OBJEXT)}, they are not suitable -for Libtool libraries (where the expected object extension is -@file{.lo}): @code{LTLIBOBJS} and @code{LTALLOCA} should be used -instead. +filenames that end with @code{.$(OBJEXT)}, they are not suitable for +Libtool libraries (where the expected object extension is @file{.lo}): +@code{LTLIBOBJS} and @code{LTALLOCA} should be used instead. @code{LTLIBOBJS} is defined automatically by Autoconf and should not be defined by hand (as in the past), however at the time of writing -- 2.43.5