This is the mail archive of the automake@gnu.org mailing list for the automake project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Subdirectory problem


| --- automake.in	22 Sep 2002 14:35:19 -0000	1.1360
| +++ automake.in	22 Sep 2002 18:58:10 -0000
| @@ -2542,8 +2542,6 @@
|  		{
|  		    (my $xobj = $object) =~ s,lo$,\$(OBJEXT),;
|  		    $compile_clean_files{$xobj} = MOSTLY_CLEAN;
| -
| -		    $libtool_clean_directories{$directory} = 1;
|  		}
|  
|                  push (@dep_list, require_build_directory ($directory));
| @@ -3414,6 +3412,10 @@
|        # If the resulting library lies into a subdirectory,
|        # make sure this directory will exist.
|        my $dirstamp = require_build_directory_maybe ($onelib);
| +
| +      # Remember to cleanup .libs/ in this directory.
| +      my $dirname = dirname $onelib;
| +      $libtool_clean_directories{$dirname} = 1;
|  
|        $output_rules .= &file_contents ('ltlibrary',
|  				       ('LTLIBRARY'  => $onelib,

This caused a failure (subobj9.test).  In fact we need to clean
both directories.  I'm installing the following fix-to-the-fix.

2002-09-24  Alexandre Duret-Lutz  <duret_g@epita.fr>

	* automake.in (handle_single_transform_list): Revert the change
	from 2002-09-22.  We need to erase .libs/ in the object directory
	in addition to the library directory.
 
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1363
diff -u -r1.1363 automake.in
--- automake.in	24 Sep 2002 10:51:07 -0000	1.1363
+++ automake.in	24 Sep 2002 20:01:22 -0000
@@ -2542,6 +2542,9 @@
 		{
 		    (my $xobj = $object) =~ s,lo$,\$(OBJEXT),;
 		    $compile_clean_files{$xobj} = MOSTLY_CLEAN;
+
+		    # Remove any libtool object in this directory.
+		    $libtool_clean_directories{$directory} = 1;
 		}
 
                 push (@dep_list, require_build_directory ($directory));


-- 
Alexandre Duret-Lutz




Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]