Return-Path: 
 <cvs-return-3747-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 51527 invoked by uid 500); 11 Jul 2002 15:49:05 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 51515 invoked from network); 11 Jul 2002 15:49:05 -0000
Date: 11 Jul 2002 15:49:04 -0000
Message-ID: <20020711154904.7348.qmail@icarus.apache.org>
From: bnicholes@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/build nw_export.inc
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bnicholes    2002/07/11 08:49:04

  Modified:    .        NWGNUmakefile
               build    nw_export.inc
  Log:
  Fixing up APR for NetWare so that it builds with the new apr_poll() changes
  
  Revision  Changes    Path
  1.7       +9 -0      apr/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/apr/NWGNUmakefile,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NWGNUmakefile	26 Jun 2002 22:01:02 -0000	1.6
  +++ NWGNUmakefile	11 Jul 2002 15:49:04 -0000	1.7
  @@ -295,6 +295,7 @@
   	$(OBJDIR)/utf8_ucs2.o \
   	$(OBJDIR)/uuid.o \
   	$(OBJDIR)/version.o \
  +	$(OBJDIR)/waitio.o \
   	$(OBJDIR)/xlate.o \
   	$(EOLIST)
   
  @@ -389,6 +390,10 @@
   $(OBJDIR)/%.o: network_io/unix/%.c $(OBJDIR)\cc.opt
   	@echo Compiling $<
   	$(CC) network_io\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +	
  +$(OBJDIR)/%.o: poll/unix/%.c $(OBJDIR)\cc.opt
  +	@echo Compiling $<
  +	$(CC) poll\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
   
   $(OBJDIR)/%.o: i18n/unix/%.c $(OBJDIR)\cc.opt
   	@echo Compiling $<
  @@ -401,6 +406,10 @@
   $(OBJDIR)/%.o: shmem/unix/%.c $(OBJDIR)\cc.opt
   	@echo Compiling $<
   	$(CC) shmem\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
  +
  +$(OBJDIR)/%.o: support/unix/%.c $(OBJDIR)\cc.opt
  +	@echo Compiling $<
  +	$(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  
  1.7       +6 -0      apr/build/nw_export.inc
  
  Index: nw_export.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/nw_export.inc,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- nw_export.inc	15 May 2002 11:06:58 -0000	1.6
  +++ nw_export.inc	11 Jul 2002 15:49:04 -0000	1.7
  @@ -10,11 +10,13 @@
   #undef APR_DECLARE_DATA
   
   /* Preprocess all of the standard APR headers. */
  +#include "apr_allocator.h"
   #include "apr_atomic.h"
   #include "apr_compat.h"
   #include "apr_dso.h"
   #include "apr_errno.h"
   #include "apr_file_info.h"
  +#include "apr_file_io.h"
   #include "apr_fnmatch.h"
   #include "apr_general.h"
   #include "apr_getopt.h"
  @@ -25,6 +27,7 @@
   #include "apr_md5.h"
   #include "apr_mmap.h"
   #include "apr_network_io.h"
  +#include "apr_poll.h"
   #include "apr_pools.h"
   #include "apr_portable.h"
   #include "apr_proc_mutex.h"
  @@ -32,6 +35,7 @@
   #include "apr_shm.h"
   #include "apr_signal.h"
   #include "apr_strings.h"
  +#include "apr_support.h"
   #include "apr_tables.h"
   #include "apr_thread_cond.h"
   #include "apr_thread_mutex.h"
  @@ -54,6 +58,7 @@
   #undef APU_DECLARE_DATA
   
   /* Preprocess all of the standard APR headers. */
  +#include "apr_anylock.h"
   #include "apr_base64.h"
   #include "apr_buckets.h"
   #include "apr_date.h"
  @@ -65,6 +70,7 @@
   #include "apr_rmm.h"
   #include "apr_sdbm.h"
   #include "apr_sha1.h"
  +#include "apr_strmatch.h"
   #include "apr_uri.h"
   #include "apr_xml.h"
   #include "apr_compat.h"