You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2009/06/27 23:50:17 UTC
svn commit: r789019 - in /apr/apr/trunk: NWGNUmakefile
build/NWGNUenvironment.inc build/NWGNUmakefile build/NWGNUtail.inc
build/nw_export.inc dbd/NWGNUdbdmysql ldap/NWGNUmakefile uri/NWGNUmakefile
xml/NWGNUmakefile
Author: fuankg
Date: Sat Jun 27 21:50:16 2009
New Revision: 789019
URL: http://svn.apache.org/viewvc?rev=789019&view=rev
Log:
fixed NetWare build.
Removed:
apr/apr/trunk/uri/NWGNUmakefile
Modified:
apr/apr/trunk/NWGNUmakefile
apr/apr/trunk/build/NWGNUenvironment.inc
apr/apr/trunk/build/NWGNUmakefile
apr/apr/trunk/build/NWGNUtail.inc
apr/apr/trunk/build/nw_export.inc
apr/apr/trunk/dbd/NWGNUdbdmysql
apr/apr/trunk/ldap/NWGNUmakefile
apr/apr/trunk/xml/NWGNUmakefile
Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sat Jun 27 21:50:16 2009
@@ -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 @@
$(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_libs = \
libcpre.o \
$(APRLIB) \
- $(APRUTLIB) \
- $(APULDAPLIB) \
- $(XMLLIB) \
+ $(APRBUCKETSLIB) \
+ $(APRLDAPLIB) \
+ $(APRXMLLIB) \
$(EOLIST)
#
@@ -267,25 +278,43 @@
#
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 @@
$(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 @@
$(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 @@
-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 @@
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 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
Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sat Jun 27 21:50:16 2009
@@ -119,11 +119,12 @@
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 @@
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 @@
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 @@
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
Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sat Jun 27 21:50:16 2009
@@ -17,14 +17,14 @@
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 @@
@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 @@
@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 @@
@echo Creating $(subst /,\,$@)
copy $< $(subst /,\,$(APR))\include\$(@F)
-$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hnw
+$(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/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw
+$(APR)/include/private/%.h: $(subst /,\,$(APR))\include\private\%.hw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
+ copy $< $(subst /,\,$(APR))\include\private\$(@F)
-$(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw
+$(APR)/xml/%.h: $(subst /,\,$(APR))\xml\%.hnw
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\include\$(@F)
+ copy $< $(subst /,\,$(APR))\xml\$(@F)
-$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw
+$(APR)/xml/expat/lib/%.h: $(subst /,\,$(APR))\xml\expat\lib\%.h.in
@echo Creating $(subst /,\,$@)
- copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
-
-$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\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 @@
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
Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sat Jun 27 21:50:16 2009
@@ -224,9 +224,9 @@
@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)" ""
Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.inc?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Sat Jun 27 21:50:16 2009
@@ -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"
Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Sat Jun 27 21:50:16 2009
@@ -38,8 +38,7 @@
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APR)/include/private \
$(APR) \
$(MYSQL_INC) \
$(EOLIST)
Modified: apr/apr/trunk/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/NWGNUmakefile?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/ldap/NWGNUmakefile (original)
+++ apr/apr/trunk/ldap/NWGNUmakefile Sat Jun 27 21:50:16 2009
@@ -26,8 +26,7 @@
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APR)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -173,7 +172,7 @@
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/apuldap.lib \
+ $(OBJDIR)/ldap.lib \
$(EOLIST)
#
Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=789019&r1=789018&r2=789019&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sat Jun 27 21:50:16 2009
@@ -18,19 +18,19 @@
#
# 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 @@
# These defines will come after DEFINES
#
XDEFINES += \
+ -DHAVE_EXPAT_CONFIG_H \
$(EOLIST)
#
@@ -167,7 +168,7 @@
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/xmllib.lib \
+ $(OBJDIR)/xml.lib \
$(EOLIST)
#
@@ -247,7 +248,7 @@
# Any specialized rules here
#
-vpath %.c expat/lib
+vpath %.c $(V_PATH)
#
# Include the 'tail' makefile that has targets that depend on variables defined