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

Comparing COMP/SCRAM/src/BuildSystem/BuildSetup.pm (file contents):
Revision 1.1.2.7.2.2 by williamc, Mon Aug 14 15:35:18 2000 UTC vs.
Revision 1.1.2.7.2.2.2.1.2.3 by williamc, Tue Oct 31 13:26:29 2000 UTC

# Line 21 | Line 21 | sub new {
21          my $self={};
22          bless $self,$class;
23          $self->{toolbox}=shift;
24        #$self->init();
24          return $self;
25   }
26  
28 sub init {
29        my $self=shift;
30        $self->{toolbox}=BuildSystem::ToolBox->new($ENV{LOCALTOP});
31 }
32
27   sub _generateexternals {
28          my $self=shift;
29          my $outfile=shift;
# Line 86 | Line 80 | sub _generateexternals {
80            print $fout 'lib+=$(extralib)'."\n";
81            print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
82            print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
83 +          print $fout 'LD_LIBRARY_PATH:=$(subst $(space),:,$(LD_LIBRARY_PATH))'."\n";
84  
85            undef $fout;
86          }
# Line 166 | Line 161 | sub BuildSetup {
161        if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
162           $targetnumber--;
163        }
164 +      elsif ( $word=~/^-/ ) {
165 +         $targetnumber--;
166 +      }
167        else {
168          $ENV{"MAKETARGET_".$word}=$word;
169        }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines