httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.com>
Subject cvs commit: apache/src/regex Makefile
Date Sun, 28 Jul 1996 10:32:20 GMT
ben         96/07/28 03:32:19

  Modified:    src       Configuration.tmpl Makefile.tmpl
               src/regex  Makefile
  Log:
  Make ranlib work, when it doesn't (as it were). Clean up regex inheritance of
  Apache flags.
  
  Revision  Changes    Path
  1.22      +6 -0      apache/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -C3 -r1.21 -r1.22
  *** Configuration.tmpl	1996/07/16 22:22:08	1.21
  --- Configuration.tmpl	1996/07/28 10:32:17	1.22
  ***************
  *** 75,80 ****
  --- 75,85 ----
    # -lndbm is commonly required for DBM auth, if that is configured in.
    EXTRA_LIBS=
    
  + # Default to using ranlib on libraries (for regex). Set this to something else
  + # if ranlib kills your system (usually by setting it again in the OS specific
  + # section below)
  + RANLIB=ranlib
  + 
    # AUX_CFLAGS are system-specific control flags.
    # NOTE: IF YOU DO NOT CHOOSE ONE OF THESE, EDIT httpd.h AND CHOOSE
    # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN.
  ***************
  *** 120,125 ****
  --- 125,131 ----
    #AUX_CFLAGS= -DSCO5
    #AUX_LIBS=-lsocket -lmalloc -lprot
    #BROKEN_BPRINTF_FLAGS=-K noinline
  + #RANLIB=true
    # For SVR4
    # Some SVR4 implementations will require SO_LINGER option to be set in order
    # to guarantee buffer flushes. Dell, Esix, and UnixWare are a few of these.
  
  
  
  1.17      +1 -1      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -C3 -r1.16 -r1.17
  *** Makefile.tmpl	1996/07/27 23:00:49	1.16
  --- Makefile.tmpl	1996/07/28 10:32:17	1.17
  ***************
  *** 25,31 ****
    	$(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(LIBS) $(EXTRA_LIBS) $(AUX_LIBS)
    
    regex/libregex.a:
  ! 	cd regex; make lib CC=$(CC) CFLAGS="$(CFLAGS) $(AUX_CFLAGS) -I. -DPOSIX_MISTAKE"
    
    clean:
    	rm -f httpd $(OBJS) *pure*
  --- 25,31 ----
    	$(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(LIBS) $(EXTRA_LIBS) $(AUX_LIBS)
    
    regex/libregex.a:
  ! 	cd regex; make lib CC=$(CC) AUX_CFLAGS="$(CFLAGS) $(AUX_CFLAGS)" RANLIB=$(RANLIB)
    
    clean:
    	rm -f httpd $(OBJS) *pure*
  
  
  
  1.4       +2 -2      apache/src/regex/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/Makefile,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** Makefile	1996/07/27 04:25:42	1.3
  --- Makefile	1996/07/28 10:32:19	1.4
  ***************
  *** 6,12 ****
    # Put -Dconst= in for a pre-ANSI compiler.
    # Do not take -DPOSIX_MISTAKE out.
    # REGCFLAGS isn't important to you (it's for my use in some special contexts).
  ! CFLAGS=-I. -DPOSIX_MISTAKE
    
    # If you have a pre-ANSI compiler, put -o into MKHFLAGS.  If you want
    # the Berkeley __P macro, put -b in.
  --- 6,12 ----
    # Put -Dconst= in for a pre-ANSI compiler.
    # Do not take -DPOSIX_MISTAKE out.
    # REGCFLAGS isn't important to you (it's for my use in some special contexts).
  ! CFLAGS=-I. -DPOSIX_MISTAKE $(AUX_CFLAGS)
    
    # If you have a pre-ANSI compiler, put -o into MKHFLAGS.  If you want
    # the Berkeley __P macro, put -b in.
  ***************
  *** 40,46 ****
    lib:	purge $(OBJPRODN)
    	rm -f libregex.a
    	ar crv libregex.a $(OBJPRODN)
  ! 	ranlib libregex.a
    
    purge:
    	rm -f *.o
  --- 40,46 ----
    lib:	purge $(OBJPRODN)
    	rm -f libregex.a
    	ar crv libregex.a $(OBJPRODN)
  ! 	$(RANLIB) libregex.a
    
    purge:
    	rm -f *.o
  
  
  

Mime
View raw message