Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Date: 16 Apr 2000 01:41:22 -0000
Message-ID: <20000416014122.17752.qmail@locus.apache.org>
From: dougm@locus.apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/lib/ModPerl Code.pm

dougm       00/04/15 18:41:22

  Modified:    .        Makefile.PL
               lib/ModPerl Code.pm
  Log:
  dont need single file option now that sources are sorted on mtime
  
  Revision  Changes    Path
  1.8       +4 -11     modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.PL	2000/04/16 00:50:04	1.7
  +++ Makefile.PL	2000/04/16 01:41:21	1.8
  @@ -21,7 +21,7 @@
       use Getopt::Std;
       my %opts;
       getopts('Ecm:', \%opts);
  -    configure()    if $opts{c};
  +    configure()  if $opts{c};
       make(\%opts) if $opts{m};
   }
   
  @@ -55,9 +55,7 @@
   
   sub make {
       my $opts = shift;
  -    my $target = $opts->{m};
  -    return clean() if $target eq 'c';
  -    my $single_file = $target =~ /\.c$/ ? $target : "";
  +    return clean() if $opts->{m} eq 'c';
   
       my $ccopts = ExtUtils::Embed::ccopts();
       my @inc = $build->inc;
  @@ -68,16 +66,11 @@
       my $flags = "-g -Wall";
       $flags .= " -E" if $opts->{E};
   
  -    my @c_files = $single_file ? $single_file : $code->c_files;
  -
  -    for (sort { (stat $b)[9] <=> (stat $a)[9] } @c_files) {
  +    for (sort { (stat $b)[9] <=> (stat $a)[9] } @{ $code->c_files }) {
           echo_cmd "$cc $flags $ccopts @inc -c $_";
  -        return if $single_file;
       }
  -
  -    my @objs = $code->o_files;
   
  -    echo_cmd "$ar crv libmodperl.a @objs";
  +    echo_cmd "$ar crv libmodperl.a @{ $code->o_files }";
   
       chdir $build->cwd;
   }
  
  
  
  1.8       +2 -2      modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Code.pm	2000/04/15 23:00:45	1.7
  +++ Code.pm	2000/04/16 01:41:22	1.8
  @@ -275,8 +275,8 @@
   my @c_src_names = qw(interp log config);
   my @g_c_names = map { "modperl_$_" } qw(hooks directives);
   my @c_names   = ('mod_perl', (map "modperl_$_", @c_src_names), @g_c_names);
  -sub c_files { map { "$_.c" } @c_names }
  -sub o_files { map { "$_.o" } @c_names }
  +sub c_files { [map { "$_.c" } @c_names] }
  +sub o_files { [map { "$_.o" } @c_names] }
   
   my @g_h_names = map { "modperl_$_" } qw(hooks directives flags trace);