diff options
| -rw-r--r-- | NWGNUmakefile | 70 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 56 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 65 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 6 | ||||
| -rw-r--r-- | build/nw_export.inc | 34 | ||||
| -rw-r--r-- | dbd/NWGNUdbdmysql | 3 | ||||
| -rw-r--r-- | ldap/NWGNUmakefile | 5 | ||||
| -rw-r--r-- | uri/NWGNUmakefile | 257 | ||||
| -rw-r--r-- | xml/NWGNUmakefile | 15 |
9 files changed, 149 insertions, 362 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 5a565637d..add30eeaa 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -3,9 +3,17 @@ # SUBDIRS = \ - build \ - $(APU_WORK) \ - $(EOLIST) + build \ + buckets \ + ldap \ + xml \ + $(EOLIST) + +ifdef WITH_APR_DBD +SUBDIRS += \ + dbd \ + $(EOLIST) +endif # # Get the 'head' of the build environment. This includes default targets and @@ -29,9 +37,12 @@ XINCDIRS += \ $(APR)/include \ $(APR)/include/arch/NetWare \ $(APR)/include/arch/unix \ + $(APR)/include/private \ + $(APR)/dbm/sdbm \ + $(APR)/uri \ $(APR)/memory/unix \ $(APR)/random/unix \ - $(APRUTIL)/xml \ + $(APR)/xml \ $(EOLIST) # @@ -187,9 +198,9 @@ FILES_nlm_objs = \ FILES_nlm_libs = \ libcpre.o \ $(APRLIB) \ - $(APRUTLIB) \ - $(APULDAPLIB) \ - $(XMLLIB) \ + $(APRBUCKETSLIB) \ + $(APRLDAPLIB) \ + $(APRXMLLIB) \ $(EOLIST) # @@ -267,25 +278,43 @@ FILES_nlm_exports = \ # FILES_lib_objs = \ $(OBJDIR)/apr_atomic.o \ + $(OBJDIR)/apr_base64.o \ $(OBJDIR)/apr_cpystrn.o \ + $(OBJDIR)/apr_date.o \ + $(OBJDIR)/apr_dbd.o \ + $(OBJDIR)/apr_dbm.o \ + $(OBJDIR)/apr_dbm_berkeleydb.o \ + $(OBJDIR)/apr_dbm_sdbm.o \ $(OBJDIR)/apr_fnmatch.o \ $(OBJDIR)/apr_getpass.o \ $(OBJDIR)/apr_hash.o \ + $(OBJDIR)/apr_hooks.o \ + $(OBJDIR)/apr_md4.o \ + $(OBJDIR)/apr_md5.o \ + $(OBJDIR)/apr_memcache.o \ $(OBJDIR)/apr_pools.o \ + $(OBJDIR)/apr_queue.o \ $(OBJDIR)/apr_random.o \ + $(OBJDIR)/apr_reslist.o \ + $(OBJDIR)/apr_rmm.o \ + $(OBJDIR)/apr_sha1.o \ $(OBJDIR)/apr_snprintf.o \ $(OBJDIR)/apr_strings.o \ + $(OBJDIR)/apr_strmatch.o \ $(OBJDIR)/apr_strnatcmp.o \ $(OBJDIR)/apr_strtok.o \ $(OBJDIR)/apr_tables.o \ + $(OBJDIR)/apr_uri.o \ + $(OBJDIR)/apu_dso.o \ + $(OBJDIR)/apu_version.o \ $(OBJDIR)/buffer.o \ $(OBJDIR)/charset.o \ - $(OBJDIR)/copy.o \ $(OBJDIR)/common.o \ + $(OBJDIR)/copy.o \ $(OBJDIR)/dir.o \ $(OBJDIR)/dso.o \ - $(OBJDIR)/errorcodes.o \ $(OBJDIR)/env.o \ + $(OBJDIR)/errorcodes.o \ $(OBJDIR)/fileacc.o \ $(OBJDIR)/filedup.o \ $(OBJDIR)/filepath.o \ @@ -295,24 +324,29 @@ FILES_lib_objs = \ $(OBJDIR)/flock.o \ $(OBJDIR)/fullrw.o \ $(OBJDIR)/getopt.o \ + $(OBJDIR)/getuuid.o \ $(OBJDIR)/groupinfo.o \ - $(OBJDIR)/inet_pton.o \ $(OBJDIR)/inet_ntop.o \ + $(OBJDIR)/inet_pton.o \ $(OBJDIR)/libprews.o \ $(OBJDIR)/mktemp.o \ $(OBJDIR)/mmap.o \ $(OBJDIR)/multicast.o \ $(OBJDIR)/open.o \ - $(OBJDIR)/pipe.o \ $(OBJDIR)/otherchild.o \ + $(OBJDIR)/pipe.o \ + $(OBJDIR)/pollcb.o \ + $(OBJDIR)/pollset.o \ $(OBJDIR)/proc.o \ - $(OBJDIR)/procsup.o \ $(OBJDIR)/proc_mutex.o \ + $(OBJDIR)/procsup.o \ $(OBJDIR)/rand.o \ $(OBJDIR)/readwrite.o \ + $(OBJDIR)/sdbm.o \ + $(OBJDIR)/sdbm_hash.o \ + $(OBJDIR)/sdbm_lock.o \ + $(OBJDIR)/sdbm_pair.o \ $(OBJDIR)/seek.o \ - $(OBJDIR)/pollcb.o \ - $(OBJDIR)/pollset.o \ $(OBJDIR)/select.o \ $(OBJDIR)/sendrecv.o \ $(OBJDIR)/sha2.o \ @@ -332,11 +366,12 @@ FILES_lib_objs = \ $(OBJDIR)/time.o \ $(OBJDIR)/timestr.o \ $(OBJDIR)/userinfo.o \ + $(OBJDIR)/uuid.o \ $(OBJDIR)/version.o \ $(OBJDIR)/waitio.o \ + $(OBJDIR)/xlate.o \ $(EOLIST) - # # implement targets and dependancies (leave this section alone) # @@ -355,8 +390,6 @@ ifndef DEST -copy $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr -copy $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* -copy $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr - -copy $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu - -copy $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu @echo rem copying the docs directories > xc.bat @echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat $(CMD) xc.bat @@ -366,7 +399,6 @@ endif ifndef DEST installdev :: $(INSTDEVDIRS) FORCE -copy $(subst /,\,$(APR))\include\*.h $(INSTALLBASE)\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.* -copy $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.* -copy $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.* @@ -382,6 +414,8 @@ vpath %.c atomic/netware:strings:tables:passwd:lib: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 +vpath %.c crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate +vpath %.c util-misc # Use the win32 network_io if Winsock is being used ifdef USE_STDSOCKETS diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 8075309e2..92ae226ab 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -119,11 +119,12 @@ endif NOVI = $(NOVELLLIBC)\imports -INCDIRS = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock; +INCDIRS = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks; DEFINES = -DNETWARE ifndef USE_STDSOCKETS DEFINES += -DUSE_WINSOCK +INCDIRS += $(NOVELLLIBC)\include\winsock; endif ifndef DEBUG DEFINES += -DNDEBUG @@ -224,31 +225,22 @@ ifdef DEST ifndef BASEDIR BASEDIR = Apache2 endif - INSTALLBASE := $(INSTALL)\$(BASEDIR) -INSTDEVDIRS := \ - $(INSTDIRS) \ - $(INSTALLBASE) \ - $(INSTALLBASE)\include \ - $(INSTALLBASE)\lib \ - -INSTDIRS += \ - $(INSTALLBASE) \ - else + INSTALLBASE := $(INSTALL)\apr +endif + INSTDEVDIRS := \ - $(INSTDIRS) \ + $(INSTDIRS) \ $(INSTALLBASE) \ $(INSTALLBASE)\include \ $(INSTALLBASE)\lib \ INSTDIRS += \ - $(INSTALLBASE) \ - -endif + $(INSTALLBASE) # # Declare Command and tool macros here @@ -260,21 +252,19 @@ OS = Windows_NT endif ifeq "$(OS)" "Windows_NT" -CMD=cmd /C -CHK=cmd /C if exist -CHKNOT=cmd /C if not exist -DEL = del /F -DELTREE = cmd /C rd /s/q -WINNT=1 +CMD = cmd /C +DEL = del /F +DELTREE = $(CMD) rd /s/q +WINNT = 1 XCOPYSW = /E else -CMD=command /C -CHK=command /C if exist -CHKNOT=command /C if not exist -DEL = del -DELTREE = deltree /y -XCOPYSW = /E /Y +CMD = command /C +DEL = del +DELTREE = deltree /y +XCOPYSW = /E /Y endif +CHK = $(CMD) if exist +CHKNOT = $(CMD) if not exist # @@ -287,18 +277,18 @@ endif APR = $(APR_WORK) APRTEST = $(APR_WORK)/test -APRUTIL = $(APU_WORK) -APULDAP = $(APU_WORK)/ldap -XML = $(APRUTIL)/xml +APRBUCKETS = $(APR_WORK)/buckets +APRLDAP = $(APR_WORK)/ldap +APRXML = $(APR_WORK)/xml # # Internal Libraries # APRLIB = $(APR)/$(OBJDIR)/aprlib.lib -APRUTLIB = $(APRUTIL)/$(OBJDIR)/aprutil.lib -APULDAPLIB = $(APULDAP)/$(OBJDIR)/apuldap.lib -XMLLIB = $(XML)/$(OBJDIR)/xmllib.lib +APRBUCKETSLIB = $(APRBUCKETS)/$(OBJDIR)/buckets.lib +APRLDAPLIB = $(APRLDAP)/$(OBJDIR)/ldap.lib +APRXMLLIB = $(APRXML)/$(OBJDIR)/xml.lib # # Additional general defines diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 1c3f4b1b6..f23e37d2f 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -17,14 +17,14 @@ include $(APR_WORK)\build\NWGNUhead.inc FILES_prebuild_headers = \ $(APR)/include/apr.h \ - $(APRUTIL)/include/apu.h \ - $(APRUTIL)/include/apu_want.h \ - $(APRUTIL)/include/apr_ldap.h \ - $(APRUTIL)/include/private/apu_config.h \ - $(APRUTIL)/include/private/apu_select_dbm.h \ - $(APRUTIL)/xml/expat/lib/expat.h \ - $(APRUTIL)/xml/expat/lib/config.h \ - $(EOLIST) + $(APR)/include/apu.h \ + $(APR)/include/apu_want.h \ + $(APR)/include/apr_ldap.h \ + $(APR)/include/private/apu_config.h \ + $(APR)/include/private/apu_select_dbm.h \ + $(APR)/xml/expat_config.h \ + $(EOLIST) +# $(APR)/xml/expat/lib/expat.h \ nlms :: $(APR)/aprlib.imp @@ -32,7 +32,7 @@ $(APR)/aprlib.imp : make_nw_export.awk nw_export.i @echo Generating $(subst /,\,$@) awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp -nw_export.i : nw_export.inc $(APRUTIL)/build/nw_apu_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt +nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt @echo Generating $(subst /,\,$@) $(CC) $< @$(NLM_NAME)_cc.opt @@ -46,8 +46,7 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_ @echo -I$(APR)\include >> $@ @echo -I$(APR)\include\arch\netware >> $@ @echo -I$(APR)\include\arch\unix >> $@ - @echo -I$(APRUTIL)\include >> $@ - @echo -I$(APRUTIL)\build >> $@ + @echo -I$(APR)\build >> $@ @echo -ir $(NOVELLLIBC) >> $@ ifneq "$(LDAPSDK)" "" @echo -ir $(LDAPSDK) >> $@ @@ -57,25 +56,21 @@ $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw @echo Creating $(subst /,\,$@) copy $< $(subst /,\,$(APR))\include\$(@F) -$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hnw - @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F) - -$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw +$(APR)/include/private/%.h: $(subst /,\,$(APR))\include\private\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F) + copy $< $(subst /,\,$(APR))\include\private\$(@F) -$(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw +$(APR)/include/private/%.h: $(subst /,\,$(APR))\include\private\%.hw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\$(@F) + copy $< $(subst /,\,$(APR))\include\private\$(@F) -$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw +$(APR)/xml/%.h: $(subst /,\,$(APR))\xml\%.hnw @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) + copy $< $(subst /,\,$(APR))\xml\$(@F) -$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.h.in +$(APR)/xml/expat/lib/%.h: $(subst /,\,$(APR))\xml\expat\lib\%.h.in @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) + copy $< $(subst /,\,$(APR))\xml\expat\lib\$(@F) # # You can use this target if all that is needed is to copy files to the @@ -85,16 +80,16 @@ install :: nlms FORCE clean :: - $(CHK) nw_export.i $(DEL) nw_export.i - $(CHK) $(NLM_NAME)_cc.opt $(DEL) $(NLM_NAME)_cc.opt - $(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc - $(CHK) $(subst /,\,$(APR))\include\apr.h $(DEL) $(subst /,\,$(APR))\include\apr.h - $(CHK) $(subst /,\,$(APRUTIL))\include\apu.h $(DEL) $(subst /,\,$(APRUTIL))\include\apu.h - $(CHK) $(subst /,\,$(APRUTIL))\include\apu_want.h $(DEL) $(subst /,\,$(APRUTIL))\include\apu_want.h - $(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h - $(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_config.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_config.h - $(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h - $(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat.h $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat.h - $(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\config.h $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\config.h - $(CHK) $(subst /,\,$(APR))\aprlib.imp $(DEL) $(subst /,\,$(APR))\aprlib.imp + $(CHK) nw_export.i $(DEL) nw_export.i + $(CHK) $(NLM_NAME)_cc.opt $(DEL) $(NLM_NAME)_cc.opt + $(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc + $(CHK) $(subst /,\,$(APR))\include\apr.h $(DEL) $(subst /,\,$(APR))\include\apr.h + $(CHK) $(subst /,\,$(APR))\include\apu.h $(DEL) $(subst /,\,$(APR))\include\apu.h + $(CHK) $(subst /,\,$(APR))\include\apu_want.h $(DEL) $(subst /,\,$(APR))\include\apu_want.h + $(CHK) $(subst /,\,$(APR))\include\apr_ldap.h $(DEL) $(subst /,\,$(APR))\include\apr_ldap.h + $(CHK) $(subst /,\,$(APR))\include\private\apu_config.h $(DEL) $(subst /,\,$(APR))\include\private\apu_config.h + $(CHK) $(subst /,\,$(APR))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APR))\include\private\apu_select_dbm.h + $(CHK) $(subst /,\,$(APR))\xml\expat_config.h $(DEL) $(subst /,\,$(APR))\xml\expat_config.h +# $(CHK) $(subst /,\,$(APR))\xml\expat.h $(DEL) $(subst /,\,$(APR))\xml\expat.h + $(CHK) $(subst /,\,$(APR))\aprlib.imp $(DEL) $(subst /,\,$(APR))\aprlib.imp diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 8d7829dd1..5ed49c9d3 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -224,9 +224,9 @@ else @echo -sym internal >> $@ endif @echo -l $(APR)/$(OBJDIR) >> $@ - @echo -l $(APRUTIL)/$(OBJDIR) >> $@ - @echo -l $(APULDAP)/$(OBJDIR) >> $@ - @echo -l $(XML)/$(OBJDIR) >> $@ + @echo -l $(APRBUCKETS)/$(OBJDIR) >> $@ + @echo -l $(APRLDAP)/$(OBJDIR) >> $@ + @echo -l $(APRXML)/$(OBJDIR) >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@ ifneq "$(IPV6)" "" diff --git a/build/nw_export.inc b/build/nw_export.inc index 452b40181..bb2d59bda 100644 --- a/build/nw_export.inc +++ b/build/nw_export.inc @@ -11,7 +11,13 @@ /* Preprocess all of the standard APR headers. */ #include "apr_allocator.h" +#include "apr_anylock.h" #include "apr_atomic.h" +#include "apr_base64.h" +#include "apr_buckets.h" +#include "apr_date.h" +#include "apr_dbd.h" +#include "apr_dbm.h" #include "apr_dso.h" #include "apr_env.h" #include "apr_errno.h" @@ -22,19 +28,36 @@ #include "apr_getopt.h" #include "apr_global_mutex.h" #include "apr_hash.h" +#include "apr_hooks.h" #include "apr_inherit.h" +#include "apr_ldap.h" +#include "apr_ldap_init.h" +#include "apr_ldap_option.h" +#include "apr_ldap_rebind.h" +#include "apr_ldap_url.h" #include "apr_lib.h" +#include "apr_md4.h" +#include "apr_md5.h" +#include "apr_memcache.h" #include "apr_mmap.h" #include "apr_network_io.h" +#include "apr_optional.h" +#include "apr_optional_hooks.h" #include "apr_poll.h" #include "apr_pools.h" #include "apr_portable.h" #include "apr_proc_mutex.h" -#include "apr_ring.h" +#include "apr_queue.h" #include "apr_random.h" +#include "apr_reslist.h" +#include "apr_ring.h" +#include "apr_rmm.h" +#include "apr_sdbm.h" +#include "apr_sha1.h" #include "apr_shm.h" #include "apr_signal.h" #include "apr_strings.h" +#include "apr_strmatch.h" #include "apr_support.h" #include "apr_tables.h" #include "apr_thread_cond.h" @@ -42,9 +65,12 @@ #include "apr_thread_proc.h" #include "apr_thread_rwlock.h" #include "apr_time.h" +#include "apr_uri.h" #include "apr_user.h" +#include "apr_uuid.h" #include "apr_version.h" #include "apr_want.h" - -#include "nw_apu_export.inc" - +#include "apr_xlate.h" +#include "apr_xml.h" +#include "apu_version.h" +#include "apu_want.h" diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql index 151eb953b..283bdaef3 100644 --- a/dbd/NWGNUdbdmysql +++ b/dbd/NWGNUdbdmysql @@ -38,8 +38,7 @@ MYSQL_NLM = libmysql XINCDIRS += \ $(APR)/include/arch/netware \ $(APR)/include \ - $(APRUTIL)/include \ - $(APRUTIL)/include/private \ + $(APR)/include/private \ $(APR) \ $(MYSQL_INC) \ $(EOLIST) diff --git a/ldap/NWGNUmakefile b/ldap/NWGNUmakefile index 967a9f1f0..59bd62df1 100644 --- a/ldap/NWGNUmakefile +++ b/ldap/NWGNUmakefile @@ -26,8 +26,7 @@ include $(APR_WORK)\build\NWGNUhead.inc XINCDIRS += \ $(APR)/include \ $(APR)/include/arch/NetWare \ - $(APRUTIL)/include \ - $(APRUTIL)/include/private \ + $(APR)/include/private \ $(LDAPSDK)/inc \ $(EOLIST) @@ -173,7 +172,7 @@ TARGET_nlm = \ # If there is an LIB target, put it here # TARGET_lib = \ - $(OBJDIR)/apuldap.lib \ + $(OBJDIR)/ldap.lib \ $(EOLIST) # diff --git a/uri/NWGNUmakefile b/uri/NWGNUmakefile deleted file mode 100644 index bf97c96f6..000000000 --- a/uri/NWGNUmakefile +++ /dev/null @@ -1,257 +0,0 @@ -# -# NWGNUmakefile for GenUri.nlm (Apache2) -# 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/arch/NetWare \ - $(APR)/include \ - $(APRUTIL)/include \ - $(APRUTIL)/include/private \ - $(APRUTIL)/xml/expat/lib \ - $(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 = Genuri - -# -# This is used by the link '-desc ' directive. -# If left blank, NLM_NAME will be used. -# -NLM_DESCRIPTION = Generate URI Delimiters - -# -# This is used by the '-threadname' directive. If left blank, -# NLM_NAME Thread will be used. -# -NLM_THREAD_NAME = genuri - -# -# If this is specified, it will override VERSION value in -# $(APR_WORK)\build\NWGNUenvironment.inc -# -NLM_VERSION = 1,0,0 - -# -# If this is specified, it will override the default of 64K -# -NLM_STACK_SIZE = 8192 - -# -# If this is specified it will be used by the link '-entry' directive -# -NLM_ENTRY_SYM =_LibCPrelude - -# -# If this is specified it will be used by the link '-exit' directive -# -NLM_EXIT_SYM =_LibCPostlude - -# -# 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 = PSEUDOPREEMPTION - -# -# 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/apr.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 = \ -$(OBJDIR)/Genuri.nlm \ - $(EOLIST) - -# -# If there is an LIB target, put it here -# -TARGET_lib = \ - $(EOLIST) - -# -# These are the OBJ files needed to create the NLM target above. -# Paths must all use the '/' character -# -FILES_nlm_objs = \ - $(OBJDIR)/gen_uri_delims.o \ - $(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 = \ - libcpre.o \ - $(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 = \ - Libc \ - $(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 $(NWOS)\copyright.txt. -# -FILE_nlm_copyright = - -# -# Any additional imports go here -# -FILES_nlm_Ximports = \ - @libc.imp \ - $(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 = \ - $(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/xml/NWGNUmakefile b/xml/NWGNUmakefile index 5f85964f6..085bfa449 100644 --- a/xml/NWGNUmakefile +++ b/xml/NWGNUmakefile @@ -18,19 +18,19 @@ include $(APR_WORK)\build\NWGNUhead.inc # # Make sure all needed macro's are defined # +V_PATH = \ + $(EXPAT_SRC)/lib \ + $(EOLIST) # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ + $(V_PATH) \ $(APR)/include \ + $(APR)/include/private \ $(APR)/include/arch/NetWare \ - $(APRUTIL)/include \ - $(APRUTIL)/uri \ - $(APRUTIL)/dbm/sdbm \ - $(APRUTIL)/include/private \ - $(APRUTIL)/xml/expat/lib \ $(EOLIST) # @@ -43,6 +43,7 @@ XCFLAGS += \ # These defines will come after DEFINES # XDEFINES += \ + -DHAVE_EXPAT_CONFIG_H \ $(EOLIST) # @@ -167,7 +168,7 @@ TARGET_nlm = \ # If there is an LIB target, put it here # TARGET_lib = \ - $(OBJDIR)/xmllib.lib \ + $(OBJDIR)/xml.lib \ $(EOLIST) # @@ -247,7 +248,7 @@ install :: nlms FORCE # Any specialized rules here # -vpath %.c expat/lib +vpath %.c $(V_PATH) # # Include the 'tail' makefile that has targets that depend on variables defined |