rbb         99/08/27 09:26:12

  Modified:    src/lib/apr Makefile.in
               src/lib/apr/file_io/beos Makefile.in
               src/lib/apr/file_io/os2 Makefile.in
               src/lib/apr/file_io/unix Makefile.in
               src/lib/apr/inc apr_pools.h
               src/lib/apr/locks/beos Makefile.in
               src/lib/apr/locks/os2 Makefile.in
               src/lib/apr/locks/unix Makefile.in
               src/lib/apr/misc/beos Makefile.in misc.h start.c
               src/lib/apr/misc/os2 Makefile.in misc.h start.c
               src/lib/apr/misc/unix Makefile.in misc.h start.c
               src/lib/apr/misc/win32 misc.h start.c
               src/lib/apr/network_io/beos Makefile.in
               src/lib/apr/network_io/os2 Makefile.in
               src/lib/apr/network_io/unix Makefile.in
               src/lib/apr/shmem/unix Makefile.in
               src/lib/apr/signal/unix Makefile.in
               src/lib/apr/threadproc/beos Makefile.in
               src/lib/apr/threadproc/os2 Makefile.in
               src/lib/apr/threadproc/unix Makefile.in
               src/lib/apr/time/beos Makefile.in
               src/lib/apr/time/os2 Makefile.in
               src/lib/apr/time/unix Makefile.in
  Log:
  Fix compilation bugs in APR.  Move compiled libraries into a common libs
  directory after building.  Removed (signal|cancel)_safe flags from context.
  
  Revision  Changes    Path
  1.4       +3 -4      apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/19 21:45:29     1.3
  +++ Makefile.in       1999/08/27 16:25:33     1.4
  @@ -23,7 +23,7 @@
   #
   # Macros for target determination
   #
  -MODULES=lib file_io network_io threadproc locks misc time sig
  +MODULES=lib file_io network_io threadproc locks misc time signal
   SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@ \
           locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ 
   #shmem/@OSDIR@
  @@ -39,10 +39,9 @@
   # building the entire package.
   #
   all: Makefile $(MODULES) subdirs
  +     rm -Rf libs
        mkdir libs
  -     @for i in $(SUBDIRS); do \
  -         cp $$1/lib*.a libs \ 
  -     done;
  +     @for i in $(SUBDIRS); do cp $$i/lib*.a libs ; done;
        @echo APR built.
   
   clean: subdirs_clean
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:35     1.1
  +++ Makefile.in       1999/08/27 16:25:34     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libfile.a
  +LIB=libfile.a
   
   OBJS=dir.o \
        fileacc.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:36     1.1
  +++ Makefile.in       1999/08/27 16:25:35     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../file.a
  +LIB=file.a
   
   OBJS=dir.o \
        fileacc.o \
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/18 20:18:46     1.3
  +++ Makefile.in       1999/08/27 16:25:35     1.4
  @@ -13,7 +13,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libfile.a
  +LIB=libfile.a
   
   OBJS=dir.o \
        fileacc.o \
  
  
  
  1.2       +0 -7      apache-2.0/src/lib/apr/inc/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/inc/apr_pools.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_pools.h       1999/08/17 15:59:37     1.1
  +++ apr_pools.h       1999/08/27 16:25:36     1.2
  @@ -141,13 +141,6 @@
    * currently being used...
    */
   
  -typedef struct ap_table_entry_t {
  -    char *key;               /* maybe NULL in future;
  -                      * check when iterating thru table_elts
  -                      */
  -    char *val;
  -} ap_table_entry_t;
  -
   ap_pool_t *ap_init_alloc(void);              /* Set up everything */
   
   /* used to guarantee to the pool debugging code that the sub pool will not be
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/locks/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:42     1.1
  +++ Makefile.in       1999/08/27 16:25:37     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../liblock.a
  +LIB=liblock.a
   
   OBJS=locks.o \
        crossproc.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/locks/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:42     1.1
  +++ Makefile.in       1999/08/27 16:25:38     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/os2
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../lock.a
  +LIB=lock.a
   
   OBJS=locks.o
   
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/locks/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:42     1.1
  +++ Makefile.in       1999/08/27 16:25:39     1.2
  @@ -14,7 +14,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../liblock.a
  +LIB=liblock.a
   
   OBJS=locks.o \
        crossproc.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/misc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:42     1.1
  +++ Makefile.in       1999/08/27 16:25:41     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../libmisc.a
  +LIB=libmisc.a
   
   OBJS=start.o \
   
  
  
  
  1.2       +0 -2      apache-2.0/src/lib/apr/misc/beos/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- misc.h    1999/08/17 15:59:42     1.1
  +++ misc.h    1999/08/27 16:25:41     1.2
  @@ -62,8 +62,6 @@
   
   struct context_t {
       struct ap_pool_t *pool;
  -    ap_int16_t signal_safe;
  -    ap_int16_t cancel_safe;
       void *prog_data;
   };
   
  
  
  
  1.2       +0 -26     apache-2.0/src/lib/apr/misc/beos/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start.c   1999/08/17 15:59:42     1.1
  +++ start.c   1999/08/27 16:25:41     1.2
  @@ -93,35 +93,9 @@
       else {
           new->prog_data = data;
       }
  -    if (cont) { 
  -        new->signal_safe = cont->signal_safe;
  -        new->cancel_safe = cont->cancel_safe;
  -    }
  -    else {
  -        new->signal_safe = 0;
  -        new->cancel_safe = 0;
  -    }
    
       *newcont = new;
       return APR_SUCCESS;
  -}
  -
  -ap_status_t ap_set_signal_safe(ap_context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) { 
  -        cont->signal_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -ap_status_t ap_set_cancel_safe(ap_context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) { 
  -        cont->cancel_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
   }
   
   ap_status_t ap_destroy_context(ap_context_t *cont)
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/misc/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:42     1.1
  +++ Makefile.in       1999/08/27 16:25:48     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/os2
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../misc.a
  +LIB=misc.a
   
   OBJS=start.o \
   
  
  
  
  1.2       +0 -2      apache-2.0/src/lib/apr/misc/os2/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/misc.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- misc.h    1999/08/17 15:59:42     1.1
  +++ misc.h    1999/08/27 16:25:50     1.2
  @@ -62,8 +62,6 @@
   
   struct context_t {
       struct ap_pool_t *pool;
  -    ap_int16_t signal_safe;
  -    ap_int16_t cancel_safe;
       void *prog_data;
   };
   
  
  
  
  1.2       +0 -26     apache-2.0/src/lib/apr/misc/os2/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/start.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start.c   1999/08/17 15:59:42     1.1
  +++ start.c   1999/08/27 16:25:51     1.2
  @@ -90,35 +90,9 @@
       else {
           new->prog_data = data;
       }
  -    if (cont) { 
  -        new->signal_safe = cont->signal_safe;
  -        new->cancel_safe = cont->cancel_safe;
  -    }
  -    else {
  -        new->signal_safe = 0;
  -        new->cancel_safe = 0;
  -    }
    
       *newcont = new;
       return APR_SUCCESS;
  -}
  -
  -ap_status_t ap_set_signal_safe(struct context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) { 
  -        cont->signal_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -ap_status_t ap_set_cancel_safe(struct context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) {
  -        cont->cancel_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
   }
   
   ap_status_t ap_destroy_context(struct context_t *cont)
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/18 20:18:53     1.3
  +++ Makefile.in       1999/08/27 16:25:57     1.4
  @@ -14,7 +14,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../libmisc.a
  +LIB=libmisc.a
   
   OBJS=start.o getopt.o 
   
  
  
  
  1.2       +0 -2      apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- misc.h    1999/08/17 15:59:42     1.1
  +++ misc.h    1999/08/27 16:25:57     1.2
  @@ -62,8 +62,6 @@
   
   struct context_t {
       struct ap_pool_t *pool;
  -    ap_int16_t signal_safe;
  -    ap_int16_t cancel_safe;
       void *prog_data;
   };
   
  
  
  
  1.2       +0 -41     apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start.c   1999/08/17 15:59:42     1.1
  +++ start.c   1999/08/27 16:25:57     1.2
  @@ -105,50 +105,9 @@
       else {
           new->prog_data = data;
       }
  -    if (cont) { 
  -        new->signal_safe = cont->signal_safe;
  -        new->cancel_safe = cont->cancel_safe;
  -    }
  -    else {
  -        new->signal_safe = 0;
  -        new->cancel_safe = 0;
  -    }
    
       *newcont = new;
       return APR_SUCCESS;
  -}
  -
  -/* ***APRDOC********************************************************
  - * ap_status_t ap_set_signal_safe(ap_context_t *, ap_int16_t)
  - *    Set the signal safe attribute of the program.  If this bit-is on, then
  - *    any apr function which uses this context IS signal safe.
  - * arg 1) The context to modify.
  - * arg 2) Should functions be signal safe or not?
  - */
  -ap_status_t ap_set_signal_safe(struct context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) { 
  -        cont->signal_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -/* ***APRDOC********************************************************
  - * ap_status_t ap_set_cancel_safe(ap_context_t *, ap_int16_t)
  - *    Set the cancel safe attribute of the program.  If this bit-is off, then
  - *    any thread which is in a function using this context IS NOT allowed
  - *    to be cancelled.
  - * arg 1) The context to modify.
  - * arg 2) Should functions be cancellable or not?
  - */
  -ap_status_t ap_set_cancel_safe(struct context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) {
  -        cont->cancel_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
   }
   
   /* ***APRDOC********************************************************
  
  
  
  1.2       +0 -2      apache-2.0/src/lib/apr/misc/win32/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- misc.h    1999/08/17 15:59:42     1.1
  +++ misc.h    1999/08/27 16:26:01     1.2
  @@ -62,8 +62,6 @@
   
   struct context_t {
       struct ap_pool_t *pool;
  -    ap_int16_t signal_safe;
  -    ap_int16_t cancel_safe;
       void *prog_data;
   };
   
  
  
  
  1.2       +0 -26     apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start.c   1999/08/17 15:59:42     1.1
  +++ start.c   1999/08/27 16:26:01     1.2
  @@ -101,14 +101,6 @@
       else {
           new->prog_data = data;
       }
  -    if (cont) { 
  -        new->signal_safe = cont->signal_safe;
  -        new->cancel_safe = cont->cancel_safe;
  -    }
  -    else {
  -        new->signal_safe = 0;
  -        new->cancel_safe = 0;
  -    }
   
       iVersionRequested = MAKEWORD(WSAHighByte, WSALowByte);
       err = WSAStartup((WORD) iVersionRequested, &wsaData);
  @@ -125,24 +117,6 @@
   
       *newcont = new;
       return APR_SUCCESS;
  -}
  -
  -ap_status_t ap_set_signal_safe(ap_context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) { 
  -        cont->signal_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -ap_status_t ap_set_cancel_safe(ap_context_t *cont, ap_int16_t safe)
  -{
  -    if (cont) {
  -        cont->cancel_safe = safe;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
   }
   
   ap_status_t ap_destroy_context(ap_context_t *cont)
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/network_io/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:43     1.1
  +++ Makefile.in       1999/08/27 16:26:03     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libnetwork.a
  +LIB=libnetwork.a
   
   OBJS=poll.o \
        sendrecv.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/network_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:43     1.1
  +++ Makefile.in       1999/08/27 16:26:04     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../network.a
  +LIB=network.a
   
   OBJS=poll.o \
        sendrecv.o \
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/18 20:18:56     1.3
  +++ Makefile.in       1999/08/27 16:26:05     1.4
  @@ -13,7 +13,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libnetwork.a
  +LIB=libnetwork.a
   
   OBJS=poll.o \
        sendrecv.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/shmem/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:44     1.1
  +++ Makefile.in       1999/08/27 16:26:06     1.2
  @@ -13,7 +13,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -Imm -I.
   
  -LIB=../libshmem.a
  +LIB=libshmem.a
   
   OBJS=shmem.o \
   
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/signal/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/signal/unix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:46     1.1
  +++ Makefile.in       1999/08/27 16:26:07     1.2
  @@ -14,7 +14,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../libsig.a
  +LIB=libsig.a
   
   OBJS=signal.o \
   
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:49     1.1
  +++ Makefile.in       1999/08/27 16:26:08     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/@OSDIR@
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../libthreadproc.a
  +LIB=libthreadproc.a
   
   OBJS=proc.o \
        thread.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/threadproc/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:50     1.1
  +++ Makefile.in       1999/08/27 16:26:09     1.2
  @@ -13,7 +13,7 @@
   INCDIR2=../../file_io/os2
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../threadproc.a
  +LIB=threadproc.a
   
   OBJS=proc.o \
        thread.o \
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/18 20:20:23     1.3
  +++ Makefile.in       1999/08/27 16:26:09     1.4
  @@ -14,7 +14,7 @@
   INCDIR2=../../file_io/unix
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
  -LIB=../libthreadproc.a
  +LIB=libthreadproc.a
   
   OBJS=proc.o \
        procsup.o \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/time/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/beos/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:51     1.1
  +++ Makefile.in       1999/08/27 16:26:10     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libtime.a
  +LIB=libtime.a
   
   OBJS=time.o \
        access.o
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/time/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in       1999/08/17 15:59:53     1.1
  +++ Makefile.in       1999/08/27 16:26:11     1.2
  @@ -12,7 +12,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../time.a
  +LIB=time.a
   
   OBJS=time.o \
        access.o
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/time/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in       1999/08/18 20:20:27     1.3
  +++ Makefile.in       1999/08/27 16:26:11     1.4
  @@ -13,7 +13,7 @@
   INCDIR1=../../include
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
   
  -LIB=../libtime.a
  +LIB=libtime.a
   
   OBJS=time.o \
        access.o
  
  
  

Reply via email to