New module description field 'Link'.

diff --git a/ChangeLog b/ChangeLog
index ab851dcbe052b260799b2ca1b9271d95d880f1b0..27decb8969fc866b436e35b95c8cab0529543e86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-01-31  Bruno Haible  <bruno@clisp.org>
+
+       New module description field 'Link'.
+       * gnulib-tool (func_usage): Document --extract-link-directive.
+       (sed_extract_prog): Recognize 'Link' directive.
+       (func_get_link_directive): New function.
+       (func_import): Show summary of link directives.
+       Handle --extract-link-directive option.
+       * modules/acl (Link): New section.
+       * modules/clock-time (Link): New section.
+       * modules/euidaccess (Link): New section.
+       * modules/gettext (Link): New section.
+       * modules/iconv (Link): New section.
+       * modules/lock (Link): New section.
+       * modules/nanosleep (Link): New section.
+       * modules/readline (Link): New section.
+
 2007-01-27  Bruno Haible  <bruno@clisp.org>
 
        Enforce the use of gnulib modules for unportable <string.h> functions.

diff --git a/gnulib-tool b/gnulib-tool
index 4b6fcb8d804eafbb7b026217e19de4d2fbab4a7a..0046ff5160188d582845d2e5f4afefc8eb6730b6 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-01-28 13:58:02 $'
+cvsdatestamp='$Date: 2007-02-01 01:52:34 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -93,6 +93,7 @@ Usage: gnulib-tool --list
        gnulib-tool --extract-autoconf-snippet module
        gnulib-tool --extract-automake-snippet module
        gnulib-tool --extract-include-directive module
+       gnulib-tool --extract-link-directive module
        gnulib-tool --extract-license module
        gnulib-tool --extract-maintainer module
        gnulib-tool --extract-tests-module module
@@ -117,6 +118,7 @@ Operation modes:
       --extract-autoconf-snippet   extract the snippet for configure.ac
       --extract-automake-snippet   extract the snippet for library makefile
       --extract-include-directive  extract the #include directive
+      --extract-link-directive     extract the linker directive
       --extract-license            report the license terms of the source files
                                    under lib/
       --extract-maintainer         report the maintainer(s) inside gnulib
@@ -891,6 +893,7 @@ sed_extract_prog=':[         ]*$/ {
     s/^configure\.ac:[  ]*$//
     s/^Makefile\.am:[   ]*$//
     s/^Include:[        ]*$//
+    s/^Link:[   ]*$//
     s/^License:[        ]*$//
     s/^Maintainer:[     ]*$//
     tb
@@ -1015,6 +1018,15 @@ func_get_include_directive ()
   sed -e 's/^\(["<]\)/#include \1/'
 }
 
+# func_get_link_directive module
+# Input:
+# - local_gnulib_dir  from --local-dir
+func_get_link_directive ()
+{
+  func_lookup_file "modules/$1"
+  sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file"
+}
+
 # func_get_license module
 # Input:
 # - local_gnulib_dir  from --local-dir
@@ -2252,6 +2264,19 @@ func_import ()
   ) | sed -e '/^$/d' -e 's/^/  /'
   rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if
 
+  for module in $modules; do
+    func_get_link_directive "$module"
+  done \
+    | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/  /' > "$tmp"/link
+  if test `wc -l < "$tmp"/link` != 0; then
+    echo
+    echo "You may need to use the following Makefile variables when linking."
+    echo "Use them in <program>_LDADD when linking a program, or"
+    echo "in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library."
+    cat "$tmp"/link
+  fi
+  rm -f "$tmp"/link
+
   echo
   echo "Don't forget to"
   if test "$makefile_am" = Makefile.am; then
@@ -3056,6 +3081,16 @@ case $mode in
     done
     ;;
 
+  extract-link-directive )
+    for module
+    do
+      func_verify_module
+      if test -n "$module"; then
+        func_get_link_directive "$module"
+      fi
+    done
+    ;;
+
   extract-license )
     for module
     do

diff --git a/modules/acl b/modules/acl
index 26a6f68a5e71f800633ceb2be95e8d6198a5ee7d..969511535c0bef7b2d5070c21112c99eff4e705a 100644 (file)
--- a/modules/acl
+++ b/modules/acl
@@ -18,6 +18,9 @@ Makefile.am:
 Include:
 "acl.h"
 
+Link:
+$(LIB_ACL)
+
 License:
 GPL
 

diff --git a/modules/clock-time b/modules/clock-time
index d69d613a391436e28790d7e862476bf31f67ced8..ba866d90ccf6457a6883a9e28ca117308e70bf43 100644 (file)
--- a/modules/clock-time
+++ b/modules/clock-time
@@ -14,6 +14,9 @@ Makefile.am:
 
 Include:
 
+Link:
+$(LIB_CLOCK_GETTIME)
+
 License:
 GPL
 

diff --git a/modules/euidaccess b/modules/euidaccess
index 965b719a091f625c5aeabc3afd666974a7fb905c..66cfdd805c88f7aebd29a99610008a1fc446bc5e 100644 (file)
--- a/modules/euidaccess
+++ b/modules/euidaccess
@@ -18,6 +18,9 @@ Makefile.am:
 Include:
 "euidaccess.h"
 
+Link:
+$(LIB_EACCESS)
+
 License:
 LGPL
 

diff --git a/modules/gettext b/modules/gettext
index b4f802de64f70e326f1dd6d81f3076f3c335969f..1cfee27ebee41a8c45129b05948faa5cc911925f 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -53,6 +53,9 @@ AM_CPPFLAGS += -I$(top_builddir)/intl
 Include:
 "gettext.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 

diff --git a/modules/iconv b/modules/iconv
index 757bd5b6cc49293249a71fcaab5c55c2d9164f3a..0b930cc52bd8b3d855b058da4760bdeaf629bfce 100644 (file)
--- a/modules/iconv
+++ b/modules/iconv
@@ -17,6 +17,9 @@ Include:
 # include <iconv.h>
 #endif
 
+Link:
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
+
 License:
 LGPL
 

diff --git a/modules/lock b/modules/lock
index c6b2ccd9d965eb5b8d20e19a2c8e47a4707f82e6..6d4a287358c4f8ba15897b7ab8a029fc5cea4e88 100644 (file)
--- a/modules/lock
+++ b/modules/lock
@@ -19,6 +19,9 @@ lib_SOURCES += lock.h lock.c
 Include:
 "lock.h"
 
+Link:
+$(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise
+
 License:
 LGPL
 

diff --git a/modules/nanosleep b/modules/nanosleep
index 02398d40796ca366b6b157749f3eef684bd62234..4cc7f527ccc0e9aed56e8cc7bea8d062818de40d 100644 (file)
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -20,6 +20,9 @@ Makefile.am:
 Include:
 "timespec.h"
 
+Link:
+$(LIB_NANOSLEEP)
+
 License:
 GPL
 

diff --git a/modules/readline b/modules/readline
index 24bbec92d8a091f8f84c106d1e8192fa2f5f7384..933ae5b62974065d1de11962d5b29c5708cbc9f8 100644 (file)
--- a/modules/readline
+++ b/modules/readline
@@ -18,6 +18,9 @@ Makefile.am:
 Include:
 "readline.h"
 
+Link:
+$(LTLIBREADLINE) when linking with libtool, $(LIBREADLINE) otherwise
+
 License:
 GPL