From 341bb713127e29f8a2ea6364df12edd091a6762f Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 29 Jan 2001 08:58:00 +0000 Subject: [PATCH] * automake.in (get_object_extension) <$default_includes>: New. Use it and &transform. --- ChangeLog | 5 +++++ automake.in | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f06aa9b4c..46316b6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-01-29 Akim Demaille + + * automake.in (get_object_extension) <$default_includes>: New. + Use it and &transform. + 2001-01-28 Tom Tromey * automake.in (variable_value_as_list_worker): Handle entries in diff --git a/automake.in b/automake.in index 00f5b2c7d..5ce38654f 100755 --- a/automake.in +++ b/automake.in @@ -805,8 +805,11 @@ sub handle_options return 0; } + +# get_object_extension ($OUT) +# --------------------------- # Return object extension. Just once, put some code into the output. -# Argument is the name of the output file +# OUT is the name of the output file sub get_object_extension { local ($out) = @_; @@ -819,10 +822,10 @@ sub get_object_extension if (! $included_generic_compile) { # Boilerplate. - local ($xform) = ''; + local ($default_include) = ''; if (! defined $options{'nostdinc'}) { - $xform = ' -I. -I\$(srcdir)'; + $default_include = ' -I. -I$(srcdir)'; if (&variable_defined ('CONFIG_HEADER')) { @@ -830,13 +833,11 @@ sub get_object_extension foreach $one_hdr (split (' ', &variable_value ('CONFIG_HEADER'))) { - local ($var); - ($var = &dirname ($one_hdr)) =~ s/(\W)/\\$1/g; - $xform .= ' -I' . $var; + $default_include .= ' -I' . &dirname ($one_hdr); } } } - $xform = 's/\@DEFAULT_INCLUDES\@/' . $xform . '/go;'; + local ($xform) = &transform ('DEFAULT_INCLUDES' => $default_include); $output_vars .= &file_contents_with_transform ($xform, 'comp-vars'); -- 2.47.2