]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Recognize @LT@, @la@, @lo@ tokens in module descriptions.
authorBruno Haible <bruno@clisp.org>
Sat, 21 Dec 2024 21:56:46 +0000 (22:56 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 21 Dec 2024 22:00:10 +0000 (23:00 +0100)
* gnulib-tool.sh (func_emit_lib_Makefile_am): Replace @LT@, @la@, @lo@
tokens.
(func_emit_tests_Makefile_am): Likewise.
* pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am): Likewise.
(GLEmiter.tests_Makefile_am): Likewise.

ChangeLog
gnulib-tool.sh
pygnulib/GLEmiter.py

index c9f61913d679e55f7cd80e7dc4c60fbded4437ce..02a1a23ba3e7f2da069777c7182490d72f20383c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-12-21  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool: Recognize @LT@, @la@, @lo@ tokens in module descriptions.
+       * gnulib-tool.sh (func_emit_lib_Makefile_am): Replace @LT@, @la@, @lo@
+       tokens.
+       (func_emit_tests_Makefile_am): Likewise.
+       * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am): Likewise.
+       (GLEmiter.tests_Makefile_am): Likewise.
+
 2024-12-20  Bruno Haible  <bruno@clisp.org>
 
        stdint: Detect MSVC __typeof__ support.
index c29de46b8f9704727286d827cd0839ffb23cd733..b622d252a5c5119f4f6d0285d16f7a44722ccccd 100755 (executable)
@@ -3798,10 +3798,12 @@ func_emit_lib_Makefile_am ()
   fi
   if test "$libtool" = true; then
     libext=la
+    objext=lo
     perhapsLT=LT
     sed_eliminate_LDFLAGS="$sed_noop"
   else
     libext=a
+    objext=o
     perhapsLT=
     sed_eliminate_LDFLAGS='/^lib_LDFLAGS[       ]*+=/d'
   fi
@@ -3842,6 +3844,9 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
                 -e "$sed_eliminate_LDFLAGS" \
                 -e "$sed_eliminate_NMD" \
+                -e "s,@LT@,$perhapsLT,g" \
+                -e "s,@la@,$libext,g" \
+                -e "s,@lo@,$objext,g" \
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
@@ -4180,9 +4185,13 @@ func_emit_tests_Makefile_am ()
   witness_macro="$1"
   if test "$libtool" = true; then
     libext=la
+    objext=lo
+    perhapsLT=LT
     sed_eliminate_LDFLAGS="$sed_noop"
   else
     libext=a
+    objext=o
+    perhapsLT=
     sed_eliminate_LDFLAGS='/^lib_LDFLAGS[       ]*+=/d'
   fi
   # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations.
@@ -4222,6 +4231,9 @@ func_emit_tests_Makefile_am ()
                 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
                 -e "$sed_eliminate_LDFLAGS" \
                 -e "$sed_eliminate_NMD" \
+                -e "s,@LT@,$perhapsLT,g" \
+                -e "s,@la@,$libext,g" \
+                -e "s,@lo@,$objext,g" \
                 -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \
                 -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
index 7eb8b27d46772b58db8ac57f6d0f624a7fac3955..8bdaf2d1918fd075a0d87abe99e1fd9360706b20 100644 (file)
@@ -702,10 +702,12 @@ AC_DEFUN([%V1%_LIBSOURCES], [
             assign = '='
         if libtool:
             libext = 'la'
+            objext = 'lo'
             perhapsLT = 'LT'
             eliminate_LDFLAGS = False
         else:  # if not libtool
             libext = 'a'
+            objext = 'o'
             perhapsLT = ''
             eliminate_LDFLAGS = True
         if for_test:
@@ -739,6 +741,10 @@ AC_DEFUN([%V1%_LIBSOURCES], [
                 # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations.
                 # The logic is similar to how we define gl_source_base_prefix.
                 amsnippet1 = _eliminate_NMD(amsnippet1, automake_subdir)
+                # Replace @LT@, @la@, @lo@, depending on libtool.
+                amsnippet1 = amsnippet1.replace('@LT@', perhapsLT)
+                amsnippet1 = amsnippet1.replace('@la@', libext)
+                amsnippet1 = amsnippet1.replace('@lo@', objext)
                 pattern = re.compile(r'lib_([A-Z]+)', re.M)
                 amsnippet1 = pattern.sub(r'%s_%s_\1' % (libname, libext),
                                          amsnippet1)
@@ -992,9 +998,13 @@ AC_DEFUN([%V1%_LIBSOURCES], [
 
         if libtool:
             libext = 'la'
+            objext = 'lo'
+            perhapsLT = 'LT'
             eliminate_LDFLAGS = False
         else:  # if not libtool
             libext = 'a'
+            objext = 'o'
+            perhapsLT = ''
             eliminate_LDFLAGS = True
         if for_test:
             # When creating a package for testing: Attempt to provoke failures,
@@ -1034,6 +1044,10 @@ AC_DEFUN([%V1%_LIBSOURCES], [
                 # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations.
                 # The logic is similar to how we define gl_source_base_prefix.
                 amsnippet1 = _eliminate_NMD(amsnippet1, False)
+                # Replace @LT@, @la@, @lo@, depending on libtool.
+                amsnippet1 = amsnippet1.replace('@LT@', perhapsLT)
+                amsnippet1 = amsnippet1.replace('@la@', libext)
+                amsnippet1 = amsnippet1.replace('@lo@', objext)
                 pattern = re.compile(r'lib_([A-Z]+)', re.M)
                 amsnippet1 = pattern.sub(r'libtests_a_\1', amsnippet1)
                 amsnippet1 = amsnippet1.replace('$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_')