You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@hyperreal.org on 1997/12/24 05:36:16 UTC

cvs commit: apachen/src/ap Makefile.tmpl

coar        97/12/23 20:36:16

  Modified:    .        STATUS
               src      CHANGES
               src/main Makefile.tmpl
               src/ap   Makefile.tmpl
  Removed:     src/main util_snprintf.c
  Log:
  	main/util_snprintf.c (which contains ap_snprintf() and friends
  	has been moved to ap/ap_snprintf.c.  Win32 project files still
  	need to be updated to reflect this change.
  
  Reviewed by:	Jim Jagielski, Dean Gaudet
  
  Revision  Changes    Path
  1.25      +1 -4      apachen/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apachen/STATUS,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- STATUS	1997/12/24 01:20:00	1.24
  +++ STATUS	1997/12/24 04:36:10	1.25
  @@ -52,12 +52,9 @@
       * Igor Tatarinov's Re: A tiny correction and a question on writev_it_all
       * Dean's [PATCH] more useful warning message for fcntl() lock failure
       * Dean's [PATCH] ap_snprintf should be more sane (fwd)
  +    * Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
   
   Available:
  -
  -    * Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
  -	<34...@Golux.Com>
  -	Status: Ken +1, Jim +1, Dean +1 (concept)
   
       * Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
   	<Pi...@twinlark.arctic.org>
  
  
  
  1.541     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.540
  retrieving revision 1.541
  diff -u -r1.540 -r1.541
  --- CHANGES	1997/12/23 21:21:39	1.540
  +++ CHANGES	1997/12/24 04:36:11	1.541
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b4
   
  +  *) ap_snprintf() moved from main/util_snprintf.c to ap/ap_snprintf.c
  +     so the functionality is available to applications other than the
  +     server itself (like the src/support tools).  [Ken Coar]
  +
     *) ap_slack() moved out of main/util.c into ap/ap_slack.c as part of
        the libap consolidation work.  [Ken Coar]
   
  
  
  
  1.7       +1 -2      apachen/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1997/10/07 19:53:25	1.6
  +++ Makefile.tmpl	1997/12/24 04:36:13	1.7
  @@ -10,7 +10,7 @@
   
   OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
     http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o\
  -  md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o \
  +  md5c.o util_md5.o explain.o http_bprintf.o util_date.o \
     fnmatch.o http_vhost.o
   
   .c.o:
  @@ -144,4 +144,3 @@
   util_script.o: util_script.c httpd.h conf.h alloc.h buff.h \
    http_config.h http_conf_globals.h http_main.h http_log.h \
    http_protocol.h http_core.h http_request.h util_script.h
  -util_snprintf.o: util_snprintf.c conf.h
  
  
  
  1.4       +2 -1      apachen/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/ap/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl	1997/12/19 14:30:13	1.3
  +++ Makefile.tmpl	1997/12/24 04:36:15	1.4
  @@ -6,7 +6,7 @@
   
   LIB=libap.a
   
  -OBJS=ap_signal.o ap_slack.o
  +OBJS=ap_signal.o ap_slack.o ap_snprintf.o
   
   .c.o:
   	$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
  @@ -26,3 +26,4 @@
   # dependencies
   ap_signal.o: $(INCDIR)/httpd.h
   ap_slack.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h
  +ap_snprintf.o: $(INCDIR)/conf.h