cvs commit: modperl-2.0/lib/Apache Build.pm

[dougm]

dougm       01/10/20 19:50:15

  Modified:    lib/Apache Build.pm
  Log:
  use more Config.pm/MakeMaker variables to make win32 happier
  
  Revision  Changes    Path
  1.55      +8 -8      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Build.pm  2001/10/20 18:59:28     1.54
  +++ Build.pm  2001/10/21 02:50:15     1.55
  @@ -704,7 +704,7 @@
   my $mm_replace = join '|', keys %perl_config_pm_alias;
   
   my @perl_config_pm =
  -  (qw(cc cpprun ld ar rm ranlib lib_ext dlext cccdlflags lddlflags),
  +  (qw(cc cpprun rm ranlib lib_ext dlext obj_ext cccdlflags lddlflags),
      values %perl_config_pm_alias);
   
   sub make_tools {
  @@ -723,7 +723,7 @@
       my $mm = bless {}, 'MM';
       $mm->init_others;
   
  -    for (qw(RM_F MV)) {
  +    for (qw(RM_F MV LD AR)) {
           my $val = $mm->{$_};
           $val =~ s/\(($mm_replace)\)/(MODPERL_\U$perl_config_pm_alias{$1})/g;
           print $fh $self->canon_make_attr($_ => $val);
  @@ -797,13 +797,13 @@
        $(MODPERL_PIC_OBJS) $(MODPERL_LDOPTS)
        $(MODPERL_RANLIB) $@
   
  -.SUFFIXES: .xs .c .o .lo .i .s
  +.SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
   
   .c.lo:
        $(MODPERL_CC) $(MODPERL_CCFLAGS_SHLIB) \
  -     -c $< && $(MODPERL_MV) $*.o $*.lo
  +     -c $< && $(MODPERL_MV) $*$(MODPERL_OBJ_EXT) $*.lo
   
  -.c.o:
  +.c$(MODPERL_OBJ_EXT):
        $(MODPERL_CC) $(MODPERL_CCFLAGS) -c $<
   
   .c.i:
  @@ -815,17 +815,17 @@
   .xs.c:
        $(MODPERL_XSUBPP) $*.xs >$@
   
  -.xs.o:
  +.xs$(MODPERL_OBJ_EXT):
        $(MODPERL_XSUBPP) $*.xs >$*.c
        $(MODPERL_CC) $(MODPERL_CCFLAGS) -c $*.c
   
   .xs.lo:
        $(MODPERL_XSUBPP) $*.xs >$*.c
        $(MODPERL_CC) $(MODPERL_CCFLAGS_SHLIB) \
  -     -c $*.c && $(MODPERL_MV) $*.o $*.lo
  +     -c $*.c && $(MODPERL_MV) $*$(MODPERL_OBJ_EXT) $*.lo
   
   clean:
  -     $(MODPERL_RM_F) *.a *.so *.xsc *.o *.lo *.i *.s \
  +     $(MODPERL_RM_F) *.a *.so *.xsc *$(MODPERL_OBJ_EXT) *.lo *.i *.s \
        $(MODPERL_CLEAN_FILES) \
        $(MODPERL_XS_CLEAN_FILES)