more NetWare build tweaks.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789154 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 47 insertions, 291 deletions

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 963330608..c8012b170 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -4,7 +4,6 @@
 
 SUBDIRS = \
 	build \
-	buckets \
 	ldap \
 	xml \
 	$(EOLIST)
@@ -19,7 +18,9 @@ endif
 # 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_objs = \
 FILES_nlm_libs = \
 	libcpre.o \
 	$(APRLIB) \
-	$(APRBUCKETSLIB) \
 	$(APRLDAPLIB) \
 	$(APRXMLLIB) \
 	$(EOLIST)
@@ -279,6 +279,19 @@ FILES_nlm_exports = \
 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 atomic/netware:strings:tables:passwd:time/unix
 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
diff --git a/buckets/NWGNUmakefile b/buckets/NWGNUmakefile
deleted file mode 100644
index 0346f29a1..000000000
--- a/buckets/NWGNUmakefile
+++ /dev/null
@@ -1,261 +0,0 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST) 

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-include $(APR_WORK)/build/NWGNUhead.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(APR)/include \

-			$(APR)/include/private \

-			$(APR)/include/arch/NetWare \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	= 

-

-#

-# This is used by the link '-desc ' directive. 

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	= 

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	= 

-#

-# If this is specified, it will override VERSION value in 

-# $(APR_WORK)/build/NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	= 

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	= 

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	= 

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If this is specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	=

- 

-#

-# If this is specified it will be linked in with the XDCData option in the def 

-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 

-# be disabled by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		= 

-

-#

-# Declare all target files (you must add your files here)

-#

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(EOLIST)

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(OBJDIR)/buckets.lib \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	$(EOLIST)

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	$(EOLIST)

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

- 

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override the default copyright.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	$(EOLIST)

- 

-#   

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	$(EOLIST)

-

-#   

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(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 \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the 

-# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)

-#

-install :: nlms FORCE

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)/build/NWGNUtail.inc

-

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 5b9a8c792..27868258c 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -59,7 +59,7 @@ endif
 #
 #  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 @@ RELEASE = debug
 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 @@ CFLAGS += -g -O0
 endif
 
 # -O4,p                 level 4 optimizations, optimize for speed
-ifeq "$(RELEASE)" "optimized"
+ifeq "$(RELEASE)" "release"
 CFLAGS += -O4,p
 endif
 
@@ -281,7 +271,6 @@ CHKNOT	= $(CMD) if not exist
 
 APR		= $(subst \,/,$(APR_WORK))
 APRTEST		= $(APR)/test
-APRBUCKETS	= $(APR)/buckets
 APRLDAP		= $(APR)/ldap
 APRXML		= $(APR)/xml
 
@@ -290,7 +279,6 @@ APRXML		= $(APR)/xml
 #
 
 APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib
-APRBUCKETSLIB	= $(APRBUCKETS)/$(OBJDIR)/buckets.lib
 APRLDAPLIB	= $(APRLDAP)/$(OBJDIR)/ldap.lib
 APRXMLLIB	= $(APRXML)/$(OBJDIR)/xml.lib
 
diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index 7f6d2bec0..c02f47b8f 100644
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -55,8 +55,8 @@ help :
 	@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 @@ clean :: $(SUBDIRS)
 	$(CHK) *.map $(DEL) *.map
 	$(CHK) *.d $(DEL) *.d
 	$(CHK) *.tmp $(DEL) *.tmp
-	$(CHK) xc.bat $(DEL) xc.bat
 	-$(DELTREE) $(OBJDIR) 2> NUL
 
 $(OBJDIR) ::
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 4d1fe581e..a9f6cb731 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -175,11 +175,28 @@ $(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst
 	@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
diff --git a/build/nw_export.inc b/build/nw_export.inc
index 979692d8a..17f90ea46 100644
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -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"