httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Roy Fielding <field...@hyperreal.com>
Subject cvs commit: apache/src CHANGES Configure
Date Tue, 01 Apr 1997 05:04:27 GMT
fielding    97/03/31 21:04:26

  Modified:    src       CHANGES Configure
  Log:
  Yet another attempt at a portable modules/Makefile, thanks to a problem
  with HPsUX 10.10.
  
  Reviewed by: Doug MacEachern, Chuck Murcko, Dean Gaudet
  
  Revision  Changes    Path
  1.217     +1 -1      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -C3 -r1.216 -r1.217
  *** CHANGES	1997/04/01 05:00:19	1.216
  --- CHANGES	1997/04/01 05:04:24	1.217
  ***************
  *** 51,57 ****
         [Dean Gaudet]
    
      *) Improved generation of modules/Makefile to be more generic for
  !      new module directories. [Ken Coar and Chuck Murcko]
    
      *) Generate makefile dependency for Configuration based on the actual
         name given when running the Configure process.  [Dean Gaudet]
  --- 51,57 ----
         [Dean Gaudet]
    
      *) Improved generation of modules/Makefile to be more generic for
  !      new module directories. [Ken Coar, Chuck Murcko, Roy Fielding]
    
      *) Generate makefile dependency for Configuration based on the actual
         name given when running the Configure process.  [Dean Gaudet]
  
  
  
  1.86      +13 -10    apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -C3 -r1.85 -r1.86
  *** Configure	1997/03/25 20:21:20	1.85
  --- Configure	1997/04/01 05:04:24	1.86
  ***************
  *** 571,577 ****
    cat Makefile.config >> Makefile
    sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
    awk >>Makefile <$tmpfile \
  !    '($3 ~ /modules\//) { printf "%s: modules/last-built ; @echo linking %s\n\n", $3, $3}'
    cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile
    
    cat << EOF > modules/Makefile
  --- 571,577 ----
    cat Makefile.config >> Makefile
    sed -e "s#@@Configuration@@#$file#" "$makefile_tmpl" >>Makefile
    awk >>Makefile <$tmpfile \
  !    '($3 ~ /modules\//) { printf "%s: modules/last-built\n\n", $3, $3}'
    cat Makefile.config ../support/Makefile.tmpl > ../support/Makefile
    
    cat << EOF > modules/Makefile
  ***************
  *** 593,619 ****
    
    awk >> modules/Makefile < $tmpfile '\
       BEGIN {printf "MODULES="} \
  !    ($3 ~ /modules\//) {split ($3, pp, "/"); printf "%s.build ", pp[2]} \
       END {printf "\n"}'
    
    awk >> modules/Makefile < $tmpfile '\
       BEGIN {printf "CLEANERS="} \
  !    ($3 ~ /modules\//) {split ($3, pp, "/"); printf "%s.clean ", pp[2]} \
       END {printf "\n"}'
    
    cat << EOF >> modules/Makefile
    
    default: \$(MODULES)
  ! 	@echo "done building module subdirectories"
    
    clean: \$(CLEANERS)
  ! 	@echo "done cleaning module subdirectories"
    
  ! .SUFFIXES: .build .clean
    
  ! \$(MODULES):
  ! 	(cd \$*; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
    
  - \$(CLEANERS):
  - 	(cd \$*; \$(MAKE) clean)
    EOF
  --- 593,622 ----
    
    awk >> modules/Makefile < $tmpfile '\
       BEGIN {printf "MODULES="} \
  !    ($3 ~ /modules\//) {split ($3, pp, "/"); printf "%s ", pp[2]} \
       END {printf "\n"}'
    
    awk >> modules/Makefile < $tmpfile '\
       BEGIN {printf "CLEANERS="} \
  !    ($3 ~ /modules\//) {split ($3, pp, "/"); printf "%s_clean ", pp[2]} \
       END {printf "\n"}'
    
    cat << EOF >> modules/Makefile
    
    default: \$(MODULES)
  ! 	@echo "Done building module subdirectories"
    
    clean: \$(CLEANERS)
  ! 	@echo "Done cleaning module subdirectories"
    
  ! \$(MODULES): ForceMe
  ! 	(cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
    
  ! ForceMe:
    
    EOF
  + 
  + awk >>modules/Makefile <$tmpfile \
  +    '($3 ~ /modules\//) { split ($3, pp, "/"); \
  +    printf "%s_clean:\n\t(cd %s; $(MAKE) clean)\n\n", pp[2], pp[2]}'
  + 
  
  
  

Mime
View raw message