apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789154 - in /apr/apr/trunk: NWGNUmakefile buckets/NWGNUmakefile build/NWGNUenvironment.inc build/NWGNUhead.inc build/NWGNUtail.inc build/nw_export.inc
Date Sun, 28 Jun 2009 21:40:30 GMT
Author: fuankg
Date: Sun Jun 28 21:40:30 2009
New Revision: 789154

URL: http://svn.apache.org/viewvc?rev=789154&view=rev
Log:
more NetWare build tweaks.

Removed:
    apr/apr/trunk/buckets/NWGNUmakefile
Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUhead.inc
    apr/apr/trunk/build/NWGNUtail.inc
    apr/apr/trunk/build/nw_export.inc

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=789154&r1=789153&r2=789154&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sun Jun 28 21:40:30 2009
@@ -4,7 +4,6 @@
 
 SUBDIRS = \
 	build \
-	buckets \
 	ldap \
 	xml \
 	$(EOLIST)
@@ -19,7 +18,9 @@
 # Get the 'head' of the build environment.  This includes default targets and
 # paths to tools
 #
-
+ifndef APR_WORK
+export APR_WORK := $(strip $(shell pwd))
+endif
 include $(APR_WORK)/build/NWGNUhead.inc
 
 #
@@ -198,7 +199,6 @@
 FILES_nlm_libs = \
 	libcpre.o \
 	$(APRLIB) \
-	$(APRBUCKETSLIB) \
 	$(APRLDAPLIB) \
 	$(APRXMLLIB) \
 	$(EOLIST)
@@ -279,6 +279,19 @@
 FILES_lib_objs = \
 	$(OBJDIR)/apr_atomic.o \
 	$(OBJDIR)/apr_base64.o \
+	$(OBJDIR)/apr_brigade.o \
+	$(OBJDIR)/apr_buckets.o \
+	$(OBJDIR)/apr_buckets_alloc.o \
+	$(OBJDIR)/apr_buckets_eos.o \
+	$(OBJDIR)/apr_buckets_file.o \
+	$(OBJDIR)/apr_buckets_flush.o \
+	$(OBJDIR)/apr_buckets_heap.o \
+	$(OBJDIR)/apr_buckets_mmap.o \
+	$(OBJDIR)/apr_buckets_pipe.o \
+	$(OBJDIR)/apr_buckets_pool.o \
+	$(OBJDIR)/apr_buckets_refcount.o \
+	$(OBJDIR)/apr_buckets_simple.o \
+	$(OBJDIR)/apr_buckets_socket.o \
 	$(OBJDIR)/apr_cpystrn.o \
 	$(OBJDIR)/apr_date.o \
 	$(OBJDIR)/apr_dbd.o \
@@ -412,7 +425,7 @@
 vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
 vpath %.c poll/unix:shmem/unix:support/unix:random/unix
 vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:util-misc
-vpath %.c crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate
+vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:memcache:misc:strmatch:uri:xlate
 
 # Use the win32 network_io if Winsock is being used
 ifndef USE_STDSOCKETS

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789154&r1=789153&r2=789154&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jun 28 21:40:30 2009
@@ -59,7 +59,7 @@
 #
 #  debug	- full debug switches are set
 #  noopt	- normal switches are set
-#  optimized	- optimization switches are set (default)
+#  release	- optimization switches are set (default)
 
 ifdef reltype
 RELEASE = $(reltype)
@@ -78,28 +78,18 @@
 endif
 
 ifdef optimized
-RELEASE = optimized
+RELEASE = release
 endif
 
 ifdef OPTIMIZED
-RELEASE = optimized
+RELEASE = release
 endif
 
 ifndef RELEASE
-RELEASE = optimized
+RELEASE = release
 endif
 
-ifeq "$(RELEASE)" "debug"
-OBJDIR = Debug
-endif
-
-ifeq "$(RELEASE)" "noopt"
-OBJDIR = Noopt
-endif
-
-ifeq "$(RELEASE)" "optimized"
-OBJDIR = Release
-endif
+OBJDIR = obj_$(RELEASE)
 
 #
 # Setup compiler information
@@ -170,7 +160,7 @@
 endif
 
 # -O4,p                 level 4 optimizations, optimize for speed
-ifeq "$(RELEASE)" "optimized"
+ifeq "$(RELEASE)" "release"
 CFLAGS += -O4,p
 endif
 
@@ -281,7 +271,6 @@
 
 APR		= $(subst \,/,$(APR_WORK))
 APRTEST		= $(APR)/test
-APRBUCKETS	= $(APR)/buckets
 APRLDAP		= $(APR)/ldap
 APRXML		= $(APR)/xml
 
@@ -290,7 +279,6 @@
 #
 
 APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib
-APRBUCKETSLIB	= $(APRBUCKETS)/$(OBJDIR)/buckets.lib
 APRLDAPLIB	= $(APRLDAP)/$(OBJDIR)/ldap.lib
 APRXMLLIB	= $(APRXML)/$(OBJDIR)/xml.lib
 

Modified: apr/apr/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUhead.inc?rev=789154&r1=789153&r2=789154&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUhead.inc (original)
+++ apr/apr/trunk/build/NWGNUhead.inc Sun Jun 28 21:40:30 2009
@@ -55,8 +55,8 @@
 	@echo Multiple targets can be used on a single nmake command line -
 	@echo (i.e. $(MAKE) clean all)
 	@$(CMD) echo.
-	@echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=optimized
-	@echo The default is RELEASE=optimized
+	@echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=release
+	@echo The default is RELEASE=release
 
 clobber_all :: clean clobber_install
 
@@ -88,7 +88,6 @@
 	$(CHK) *.map $(DEL) *.map
 	$(CHK) *.d $(DEL) *.d
 	$(CHK) *.tmp $(DEL) *.tmp
-	$(CHK) xc.bat $(DEL) xc.bat
 	-$(DELTREE) $(OBJDIR) 2> NUL
 
 $(OBJDIR) ::

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=789154&r1=789153&r2=789154&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Jun 28 21:40:30 2009
@@ -175,11 +175,28 @@
 	@echo Generating $@
 	$(LIB) -o $(OBJDIR)/$(@F) @$?
 
-$(OBJDIR)/$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
+$(OBJDIR)/aprlib_lib.lst: $(aprlib_LIBLST_DEPENDS)
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
 	@echo Generating $@
 ifneq "$(strip $(FILES_lib_objs))" ""
-	@echo $(foreach objfile,$(FILES_lib_objs),$(subst /,\,$(objfile)) ) >> $@
+	@echo $(wordlist 1, 10, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 11, 20, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 21, 30, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 31, 40, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 41, 50, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 51, 60, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 61, 70, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 71, 80, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 81, 90, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 91, 100, $(FILES_lib_objs)) >> $@
+	@echo $(wordlist 101, 110, $(FILES_lib_objs)) >> $@
+endif
+
+$(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
+	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+	@echo Generating $@
+ifneq "$(strip $(FILES_lib_objs))" ""
+	@echo $(FILES_lib_objs) >> $@
 endif
 
 else # We must have more than one target library so load the individual makefiles

Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.inc?rev=789154&r1=789153&r2=789154&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Sun Jun 28 21:40:30 2009
@@ -1,6 +1,6 @@
-/* Must include apr.h first so that we can undefine
-    the standard prototypes macros after it messes with
-    them. */
+/* Must include apr.h / apu.h first so that we can undefine
+** the standard prototypes macros after it messes with them.
+*/
 #include "apr.h"
 #include "apu.h"
 



Mime
View raw message