subject:"cvs commit\: apache\-1.3\/src\/ap Makefile.tmpl"

cvs commit: apache-1.3/src/ap Makefile.tmpl

1999-08-08 Thread ronald

ronald  99/08/08 10:59:29

  Modified:src/ap   Makefile.tmpl
  Log:
  added dependency for ap_sha1.o
  
  Revision  ChangesPath
  1.35  +2 -0  apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Makefile.tmpl 1999/08/08 11:45:15 1.34
  +++ Makefile.tmpl 1999/08/08 17:59:28 1.35
  @@ -59,6 +59,8 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
$(INCDIR)/ap.h
  +ap_sha1.o: ap_sha1.c $(INCDIR)/ap_config.h $(INCDIR)/ap_sha1.h \
  + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c
   ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \

cvs commit: apache-1.3/src/ap Makefile.tmpl

1999-01-12 Thread coar

coar99/01/12 07:47:05

  Modified:src  CHANGES
   src/main Makefile.tmpl
   src/ap   Makefile.tmpl
  Removed: src/main md5c.c
  Log:
Move the main/md5c.c file to libap so non-httpd things can access
its functions.  The Win32 files still need to be adjusted..
  
  Revision  ChangesPath
  1.1212+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1211
  retrieving revision 1.1212
  diff -u -r1.1211 -r1.1212
  --- CHANGES   1999/01/10 07:48:57 1.1211
  +++ CHANGES   1999/01/12 15:46:56 1.1212
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.5
   
  +  *) Move src/main/md5c.c to src/ap/ap_md5c.c; it's httpd-neutral
  + and this makes its functions available to things in src/support.
  + [Ken Coar]
  +
   Changes with Apache 1.3.4
   
 *) Renamed macros status_drops_connection to ap_status_drops_connection
  
  
  
  1.35  +1 -4  apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Makefile.tmpl 1998/09/07 06:59:33 1.34
  +++ Makefile.tmpl 1999/01/12 15:47:00 1.35
  @@ -11,7 +11,7 @@
 http_config.o http_core.o http_log.o \
 http_main.o http_protocol.o http_request.o http_vhost.o \
 util.o util_date.o util_script.o util_uri.o util_md5.o \
  -  md5c.o rfc1413.o
  +  rfc1413.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
  @@ -131,9 +131,6 @@
$(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
$(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \
$(INCDIR)/http_protocol.h
  -md5c.o: md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h
   rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  
  
  
  1.31  +22 -14apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Makefile.tmpl 1998/09/07 06:59:32 1.30
  +++ Makefile.tmpl 1999/01/12 15:47:04 1.31
  @@ -6,7 +6,7 @@
   LIB=libap.a
   
   OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \
  - ap_slack.o ap_snprintf.o ap_fnmatch.o
  + ap_slack.o ap_snprintf.o ap_fnmatch.o ap_md5c.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
  @@ -41,25 +41,33 @@
   # DO NOT REMOVE
   ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/util_uri.h
   ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  +ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
  + $(INCDIR)/ap.h
   ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
  - $(INCDIR)/http_log.h

cvs commit: apache-1.3/src/ap Makefile.tmpl

1998-03-13 Thread Ralf S. Engelschall

rse 98/03/13 04:44:47

  Modified:src/main Makefile.tmpl
   src/ap   Makefile.tmpl
  Log:
  Make sure definitions are not in the middle of the target section (which
  confuses some Make variants) and slightly sort the objects file list for
  cosmetic issues.
  
  Revision  ChangesPath
  1.17  +7 -6  apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.tmpl 1998/03/02 07:05:55 1.16
  +++ Makefile.tmpl 1998/03/13 12:44:46 1.17
  @@ -9,15 +9,16 @@
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   INCDIR=../include
   
  -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 http_bprintf.o util_date.o util_uri.o \
  -  fnmatch.o http_vhost.o
  +LIB=  libmain.a
  +
  +OBJS= alloc.o buff.o \
  +  http_bprintf.o http_config.o http_core.o http_log.o \
  +  http_main.o http_protocol.o http_request.o http_vhost.o \
  +  util.o util_date.o util_script.o util_uri.o util_md5.o \
  +  md5c.o rfc1413.o fnmatch.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
  -
  -LIB= libmain.a
   
   all: $(LIB)
   
  
  
  
  1.15  +2 -2  apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.tmpl 1998/02/28 10:31:54 1.14
  +++ Makefile.tmpl 1998/03/13 12:44:47 1.15
  @@ -6,8 +6,8 @@
   
   LIB=libap.a
   
  -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o \
  - ap_execve.o
  +OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \
  + ap_slack.o ap_snprintf.o ap_strings.o
   
   .c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $

cvs commit: apache-1.3/src/ap Makefile.tmpl

1998-02-01 Thread coar

coar98/02/01 07:56:21

  Modified:src  Configure Makefile.tmpl
   src/os/bs2000 Makefile.tmpl
   src/os/emx Makefile.tmpl
   src/os/unix Makefile.tmpl
   src/main Makefile.tmpl
   src/ap   Makefile.tmpl
  Log:
Phase 2 of moving the .h files into src/include.. modify the scripts
and Makefiles that reference them.
  
  Revision  ChangesPath
  1.179 +4 -3  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -u -r1.178 -r1.179
  --- Configure 1998/01/21 23:59:54 1.178
  +++ Configure 1998/02/01 15:56:14 1.179
  @@ -873,7 +873,7 @@
   if [ $RULE_WANTHSREGEX = yes ]; then
   REGLIB=regex/libregex.a
   SUBDIRS=$SUBDIRS regex
  -INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH regex
  +#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH regex
   fi
   
   # create modules.c
  @@ -991,7 +991,8 @@
   echo CFLAGS1=$CFLAGS Makefile.config
   echo INCLUDES1=$INCLUDES Makefile.config
   
  -INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap
  +#INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR main ap
  +INCLUDES_AUTODEPTH=$INCLUDES_AUTODEPTH $OSDIR include
   incprefix=-I
   for depth in 0 1 2; do
   incvar=INCLUDES_DEPTH${depth}=
  @@ -1071,7 +1072,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   EOF
if [ -f $moddir/Makefile.libdir ]; then
# it's responsible for the rest of its Makefile
  
  
  
  1.74  +2 -2  apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- Makefile.tmpl 1997/11/30 19:17:23 1.73
  +++ Makefile.tmpl 1998/02/01 15:56:14 1.74
  @@ -69,5 +69,5 @@
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \
  - main/http_config.h
  +modules.o: modules.c include/httpd.h include/conf.h include/alloc.h \
  + include/buff.h include/http_config.h
  
  
  
  1.2   +1 -1  apache-1.3/src/os/bs2000/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1998/01/13 23:11:30 1.1
  +++ Makefile.tmpl 1998/02/01 15:56:16 1.2
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=   os.o os-inline.o ebcdic.o
   
  
  
  
  1.2   +1 -1  apache-1.3/src/os/emx/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1997/11/05 12:48:22 1.1
  +++ Makefile.tmpl 1998/02/01 15:56:17 1.2
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=os.o os-inline.o
   COPY=os.h os-inline.c
  
  
  
  1.10  +1 -1  apache-1.3/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.tmpl 1997/10/07 19:53:32 1.9
  +++ Makefile.tmpl 1998/02/01 15:56:18 1.10
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=os.o os-inline.o
   
  
  
  
  1.8   +163 -106  apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl 1997/12/24 04:36:13 1.7
  +++ Makefile.tmpl 1998/02/01 15:56:20 1.8
  @@ -7,9 +7,10 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  +INCDIR=../include
   
   OBJS= alloc.o http_main.o

cvs commit: apache-1.3/src/ap Makefile.tmpl

cvs commit: apache-1.3/src/ap Makefile.tmpl

cvs commit: apache-1.3/src/ap Makefile.tmpl

cvs commit: apache-1.3/src/ap Makefile.tmpl

4 matches

Site Navigation

Mail list logo

Footer information