svn commit: r329246 - in /apr/apr/trunk/build: NWGNUmakefile nw_export.inc

[bn...@apache.org]

Author: bnicholes
Date: Fri Oct 28 09:40:38 2005
New Revision: 329246

URL: http://svn.apache.org/viewcvs?rev=329246&view=rev
Log:
Try to break a code dependency that the NetWare build has between APR and APR-util

Modified:
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/build/nw_export.inc

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUmakefile?rev=329246&r1=329245&r2=329246&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Fri Oct 28 09:40:38 2005
@@ -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 $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
+nw_export.i : nw_export.inc $(APRUTIL)/build/nw_apu_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
 	@echo Generating $(subst /,\,$@)
 	$(CC) $< @$(NLM_NAME)_cc.opt
 
@@ -47,6 +47,7 @@
 	@echo -I$(APR)\include\arch\netware >> $@
 	@echo -I$(APR)\include\arch\unix >> $@
 	@echo -I$(APRUTIL)\include >> $@
+	@echo -I$(APRUTIL)\build >> $@
 	@echo -ir $(NOVELLLIBC) >> $@
 ifneq "$(LDAPSDK)" ""
 	@echo -ir $(LDAPSDK) >> $@

Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/nw_export.inc?rev=329246&r1=329245&r2=329246&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Fri Oct 28 09:40:38 2005
@@ -46,39 +46,5 @@
 #include "apr_version.h"
 #include "apr_want.h"
 
+#include "nw_apu_export.inc"
 
-/* Must include apu.h first so that we can undefine
-    the standard prototypes macros after it messes with
-    them. */
-#include "apu.h"
-
-#undef APU_DECLARE
-#undef APU_DECLARE_NONSTD
-#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"
-#include "apr_dbd.h"
-#include "apr_dbm.h"
-#include "apr_hooks.h"
-#include "apr_ldap.h"
-#include "apr_ldap_url.h"
-#include "apr_md4.h"
-#include "apr_md5.h"
-#include "apr_memcache.h"
-#include "apr_optional.h"
-#include "apr_optional_hooks.h"
-#include "apr_queue.h"
-#include "apr_reslist.h"
-#include "apr_rmm.h"
-#include "apr_sdbm.h"
-#include "apr_sha1.h"
-#include "apr_strmatch.h"
-#include "apr_uri.h"
-#include "apr_uuid.h"
-#include "apr_xlate.h"
-#include "apr_xml.h"
-#include "apu_want.h"