apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789036 - in /apr/apr/trunk/build: NWGNUenvironment.inc NWGNUmakefile nw_export.inc
Date Sun, 28 Jun 2009 02:46:39 GMT
Author: fuankg
Date: Sun Jun 28 02:46:39 2009
New Revision: 789036

URL: http://svn.apache.org/viewvc?rev=789036&view=rev
Log:
fixed NetWare build (continued...)

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

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789036&r1=789035&r2=789036&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jun 28 02:46:39 2009
@@ -57,32 +57,32 @@
 #
 # Set the Release type that you want to build, possible values are:
 #
-#  debug		- full debug switches are set
-#  noopt		- normal switches are set (default)
-#  optimized	- optimization switches are set
+#  debug	- full debug switches are set
+#  noopt	- normal switches are set
+#  optimized	- optimization switches are set (default)
 
 ifdef reltype
-RELEASE=$(reltype)
+RELEASE = $(reltype)
 endif
 
 ifdef RELTYPE
-RELEASE=$(RELTYPE)
+RELEASE = $(RELTYPE)
 endif
 
 ifdef debug
-RELEASE=debug
+RELEASE = debug
 endif
 
 ifdef DEBUG
-RELEASE=debug
+RELEASE = debug
 endif
 
 ifdef optimized
-RELEASE=optimized
+RELEASE = optimized
 endif
 
 ifdef OPTIMIZED
-RELEASE=optimized
+RELEASE = optimized
 endif
 
 ifndef RELEASE

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=789036&r1=789035&r2=789036&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sun Jun 28 02:46:39 2009
@@ -52,25 +52,25 @@
 	@echo -ir $(LDAPSDK) >> $@
 endif
 
-$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw
+$(APR)/include/%.h: $(APR)/include/%.hnw
 	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\include\$(@F)
+	copy $(subst /,\,$<) $(subst /,\,$@)
 
-$(APR)/include/private/%.h: $(subst /,\,$(APR))\include\private\%.hnw
+$(APR)/include/private/%.h: $(APR)/include/private/%.hnw
 	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\include\private\$(@F)
+	copy $(subst /,\,$<) $(subst /,\,$@)
 
-$(APR)/include/private/%.h: $(subst /,\,$(APR))\include\private\%.hw
+$(APR)/include/private/%.h: $(APR)/include/private/%.hw
 	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\include\private\$(@F)
+	copy $(subst /,\,$<) $(subst /,\,$@)
 
-$(APR)/xml/%.h: $(subst /,\,$(APR))\xml\%.hnw
+$(APRXML)/%.h: $(APRXML)/%.hnw
 	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\xml\$(@F)
+	copy $(subst /,\,$<) $(subst /,\,$@)
 
-$(APR)/xml/expat/lib/%.h: $(subst /,\,$(APR))\xml\expat\lib\%.h.in
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\xml\expat\lib\$(@F)
+$(APRXML)/expat/lib/%.h: $(APRXML)/expat/lib/%.h.in
+	@echo Creating $@
+	copy $(subst /,\,$<) $(subst /,\,$@)
 
 #
 # You can use this target if all that is needed is to copy files to the
@@ -82,7 +82,7 @@
 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) 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

Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.inc?rev=789036&r1=789035&r2=789036&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Sun Jun 28 02:46:39 2009
@@ -2,12 +2,16 @@
     the standard prototypes macros after it messes with
     them. */
 #include "apr.h"
+#include "apu.h"
 
 #undef APR_DECLARE
 #undef APR_DECLARE_NONSTD
 #undef APR_DECLARE_HOOK
 #undef APR_POOL_DECLARE_ACCESSOR
 #undef APR_DECLARE_DATA
+#undef APU_DECLARE
+#undef APU_DECLARE_NONSTD
+#undef APU_DECLARE_DATA
 
 /* Preprocess all of the standard APR headers. */
 #include "apr_allocator.h"



Mime
View raw message