ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/BuildSystem/BuildFile.pm
(Generate patch)

Comparing COMP/SCRAM/src/BuildSystem/BuildFile.pm (file contents):
Revision 1.16 by sashby, Fri Apr 12 16:42:08 2002 UTC vs.
Revision 1.17 by sashby, Tue May 14 10:21:19 2002 UTC

# Line 272 | Line 272 | sub Class_StartTag {
272          }
273   }
274  
275 < sub IncludePath_Start {
276 <        my $self=shift;
277 <        my $name=shift;
278 <        my $hashref=shift;
279 <        
280 <        $self->verbose(">> IncludePath_Start: NM ".$name." <<");
281 <        
282 <        $self->{switch}->checktag( $name, $hashref, 'path');
283 <        if ( $self->{Arch} ) {
284 <          print GNUmakefile "INCLUDE+=".$self->_location()."/".
285 <                                                $$hashref{'path'}."\n";
286 <        }
287 < }
275 > sub IncludePath_Start
276 >   {
277 >   my $self=shift;
278 >   my $name=shift;
279 >   my $hashref=shift;
280 >  
281 >   $self->verbose(">> IncludePath_Start: NM ".$name." <<");
282 >  
283 >   $self->{switch}->checktag( $name, $hashref, 'path');
284 >   if ( $self->{Arch} )
285 >      {
286 >      print GNUmakefile "INCLUDE:=\$(filter-out ".$self->_location()."/".$$hashref{'path'}.",\$(INCLUDE))","\n";
287 >      print GNUmakefile "INCLUDE+=".$self->_location()."/".$$hashref{'path'}."\n";
288 >      }
289 >   }
290  
291   #
292   # generic build tag
# Line 846 | Line 848 | sub export_end {
848   #
849   # Standard lib tag
850   #
851 < sub lib_start {
852 <        my $self=shift;
853 <        my $name=shift;
854 <        my $hashref=shift;
855 <        
856 <        $self->verbose(">> lib_start: NM ".$name." <<");
857 <
858 <        $self->{switch}->checktag($name, $hashref, 'name');
851 > sub lib_start
852 >   {
853 >   my $self=shift;
854 >   my $name=shift;
855 >   my $hashref=shift;
856 >  
857 >   $self->verbose(">> lib_start: NM ".$name." <<");
858 >  
859 >   $self->{switch}->checktag($name, $hashref, 'name');
860  
861 <        if ( $self->{Arch} ) {
862 <           print GNUmakefile "lib+=$$hashref{name}\n";
863 <        }
864 < }
861 >   if ( $self->{Arch} )
862 >      {
863 >      print GNUmakefile "lib+=$$hashref{name}\n";
864 >      }
865 >   }
866  
867   #
868   # libtype specification

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines