This is the mail archive of the
automake@gnu.org
mailing list for the automake project.
03-handle-libs.patch
- To: Automake <automake at gnu dot org>
- Subject: 03-handle-libs.patch
- From: Akim Demaille <akim at epita dot fr>
- Date: Sun, 28 Jan 2001 17:14:36 +0100
- List-Id: Discussion list for automake <automake.gnu.org><mailto:automake-request@gnu.org?subject=unsubscribe>
Index: ChangeLog
from Akim Demaille <akim@epita.fr>
* automake.in (handle_libraries, handle_ltlibraries): Use
&transform.
Index: automake.in
--- automake.in Fri, 26 Jan 2001 21:49:20 +0100 akim (am/f/39_automake.i 1.5 755)
+++ automake.in Fri, 26 Jan 2001 21:58:41 +0100 akim (am/f/39_automake.i 1.5 755)
@@ -1536,6 +1536,9 @@ sub handle_source_transform
return $linker;
}
+
+# handle_lib_objects ()
+# ---------------------
# Special-case @ALLOCA@ and @LIBOBJS@ in _LDADD or _LIBADD variables.
# Also, generate _DEPENDENCIES variable if appropriate.
# Arguments are:
@@ -1841,6 +1844,8 @@ sub handle_programs
}
+# handle_libraries ()
+# -------------------
# Handle libraries.
sub handle_libraries
{
@@ -1919,10 +1924,10 @@ sub handle_libraries
&handle_source_transform ($xlib, $onelib, $obj);
$output_rules .=
- &file_contents_with_transform ('s/\@LIBRARY\@/' . $onelib . '/go;'
- . 's/\@XLIBRARY\@/'
- . $xlib . '/go;',
- 'library');
+ &file_contents_with_transform
+ (&transform ('LIBRARY' => $onelib,
+ 'XLIBRARY' => $xlib),
+ 'library');
}
if ($seen_libobjs)
@@ -1942,6 +1947,9 @@ sub handle_libraries
&define_configure_variable ('RANLIB');
}
+
+# handle_ltlibraries ()
+# ---------------------
# Handle shared libraries.
sub handle_ltlibraries
{
@@ -2069,22 +2077,20 @@ sub handle_ltlibraries
# The user probably knows, but generally speaking automake
# doesn't -- and in fact configure could decide
# dynamically between two different locations.
- $rpath = 's/\@RPATH\@//go;';
+ $rpath = '';
}
else
{
- $rpath = ('s/\@RPATH\@/-rpath \$(' . $instdirs{$onelib}
- . 'dir)/go;');
+ $rpath = ('-rpath $(' . $instdirs{$onelib} . 'dir)');
}
$output_rules .=
- &file_contents_with_transform ('s/\@LTLIBRARY\@/'
- . $onelib . '/go;'
- . 's/\@XLTLIBRARY\@/'
- . $xlib . '/go;'
- . $rpath
- . 's/\@XLINK\@/' . $xlink . '/go;',
- 'ltlibrary');
+ &file_contents_with_transform
+ (&transform ('LTLIBRARY' => $onelib,
+ 'XLTLIBRARY' => $xlib,
+ 'RPATH' => $rpath,
+ 'XLINK' => $xlink),
+ 'ltlibrary');
}
if ($seen_libobjs)