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/modules/proxy Makefile
Date Tue, 18 Mar 1997 10:23:57 GMT
fielding    97/03/18 02:23:56

  Modified:    src       CHANGES Configure Makefile.tmpl
               src/modules/proxy  Makefile
  Log:
  Improved generation of modules/Makefile to be more generic for
  new module directories.
  
  Submitted by: Ken Coar and Chuck Murcko
  Reviewed by: Dean Gaudet and Roy Fielding
  
  Revision  Changes    Path
  1.202     +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.201
  retrieving revision 1.202
  diff -C3 -r1.201 -r1.202
  *** CHANGES	1997/03/18 09:57:39	1.201
  --- CHANGES	1997/03/18 10:23:52	1.202
  ***************
  *** 1,5 ****
  --- 1,8 ----
    Changes with Apache 1.2b8
    
  +   *) Improved generation of modules/Makefile to be more generic for
  +      new module directories. [Ken Coar and Chuck Murcko]
  + 
      *) Fixed problem with vhost error log not being set prior to
         initializing virtual hosts. [Dean Gaudet]
    
  
  
  
  1.82      +39 -0     apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -C3 -r1.81 -r1.82
  *** Configure	1997/02/25 21:04:41	1.81
  --- Configure	1997/03/18 10:23:53	1.82
  ***************
  *** 567,570 ****
  --- 567,609 ----
    # Now (finish) creating the makefiles
    cat Makefile.config >> Makefile
    cat "$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
  + # 
  + # Simple Makefile for modules in src/modules.
  + # Generated by src/Configure according to rules in src/Configuration;
  + # hand-edit at your own risk!
  + # 
  + 
  + SHELL = /bin/sh
  + EOF
  + 
  + if [ "$RULE_WANTHSREGEX" = "yes" ]; then
  +     INCLUDES2="-I../../regex"
  + fi
  + 
  + echo "INCLUDES2=$INCLUDES2">> modules/Makefile
  + echo "MOD_CFLAGS=\$(INCLUDES2) \$(AUX_CFLAGS)">> modules/Makefile
  + 
  + awk >> modules/Makefile < $tmpfile '\
  +    BEGIN {printf "MODULES="} \
  +    ($3 ~ /modules\//) {split ($3, pp, "/"); printf "%s ", pp[2]} \
  +    END {printf "\n"}'
  + cat << EOF >> modules/Makefile
  + 
  + default:
  + 	(for dir in \$(MODULES); do \\
  + 		cd \$\$dir; \\
  + 		\$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)'; \\
  + 		cd ..; \\
  + 	done)
  + 
  + clean:	
  + 	(for dir in \$(MODULES); do \\
  + 		cd \$\$dir; \$(MAKE) clean; \\
  + 		cd ..; \\
  + 	done)
  + EOF
  
  
  
  1.42      +1 -1      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -C3 -r1.41 -r1.42
  *** Makefile.tmpl	1997/02/25 20:56:38	1.41
  --- Makefile.tmpl	1997/03/18 10:23:54	1.42
  ***************
  *** 33,39 ****
    regex/libregex.a:
    	(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
  ! modules/proxy/libproxy.a:
    	(cd modules; \
    	$(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
  --- 33,39 ----
    regex/libregex.a:
    	(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
  ! modules/last-built:
    	(cd modules; \
    	$(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
    
  
  
  
  1.11      +6 -4      apache/src/modules/proxy/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/Makefile,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** Makefile	1997/01/01 18:19:59	1.10
  --- Makefile	1997/03/18 10:23:56	1.11
  ***************
  *** 53,64 ****
    
    SHELL = /bin/sh
    
  ! INCDIR=../..
    
    LIB=libproxy.a
    
    # AUX_CFLAGS comes from higher level Makefile
  ! CFLAGS=-I. -I$(INCDIR) -I$(INCDIR)/regex $(AUX_CFLAGS)
    
    # Internal stuff, should not need changing.
    PROXYSRC=mod_proxy.c proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c \
  --- 53,64 ----
    
    SHELL = /bin/sh
    
  ! INCDIR = ../..
    
    LIB=libproxy.a
    
    # AUX_CFLAGS comes from higher level Makefile
  ! CFLAGS=-I$(INCDIR) $(AUX_CFLAGS)
    
    # Internal stuff, should not need changing.
    PROXYSRC=mod_proxy.c proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c \
  ***************
  *** 66,78 ****
    
    OBJS=$(PROXYSRC:.c=.o)
    
  ! default:	$(LIB)
    
    .c.a:
    	$(MAKE) $(CFLAGS) $<
    
    $(LIB):	$(OBJS)
  - 	rm -f $@
    	ar crv $@ $(OBJS)
    	$(RANLIB) $@
    
  --- 66,80 ----
    
    OBJS=$(PROXYSRC:.c=.o)
    
  ! default:	force $(LIB)
    
    .c.a:
    	$(MAKE) $(CFLAGS) $<
    
  + force:
  + 	rm -f $(LIB)
  + 
    $(LIB):	$(OBJS)
    	ar crv $@ $(OBJS)
    	$(RANLIB) $@
    
  
  
  

Mime
View raw message