apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r791190 - in /apr/apr/branches/0.9.x/build: NWGNUenvironment.inc NWGNUmakefile
Date Sat, 04 Jul 2009 23:43:10 GMT
Author: fuankg
Date: Sat Jul  4 23:43:10 2009
New Revision: 791190

URL: http://svn.apache.org/viewvc?rev=791190&view=rev
Log:
eleminated ugly prebuild step for uri_delims.h.

Modified:
    apr/apr/branches/0.9.x/build/NWGNUenvironment.inc
    apr/apr/branches/0.9.x/build/NWGNUmakefile

Modified: apr/apr/branches/0.9.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/build/NWGNUenvironment.inc?rev=791190&r1=791189&r2=791190&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/0.9.x/build/NWGNUenvironment.inc Sat Jul  4 23:43:10 2009
@@ -110,6 +110,7 @@
 CPP	= mwccnlm
 LINK	= mwldnlm
 LIB	= mwldnlm -type library -w nocmdline
+WIN_CC	= mwcc
 
 # Setup build tools
 AWK	= awk
@@ -123,13 +124,17 @@
 DEFINES += -DNDEBUG
 endif
 
-#
 # MetroWerks static Libraries
-
 CLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime\mwcrtl.lib
 MATH3S	=
 PLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\MSL C++\MWCPP.lib
 
+# MetroWerks Win32 build flags to create build tool
+WIN_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
+WIN_CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
+WIN_CFLAGS += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
+WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
+
 # Base compile flags
 # and prefix or precompiled header added here.
 

Modified: apr/apr/branches/0.9.x/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/build/NWGNUmakefile?rev=791190&r1=791189&r2=791190&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/NWGNUmakefile (original)
+++ apr/apr/branches/0.9.x/build/NWGNUmakefile Sat Jul  4 23:43:10 2009
@@ -24,7 +24,12 @@
 	$(APRUTIL)/include/private/apu_select_dbm.h \
 	$(APRUTIL)/xml/expat/lib/expat.h \
 	$(APRUTIL)/xml/expat/lib/config.h \
+	$(APRUTIL)/uri/uri_delims.h \
 	$(EOLIST) 
+
+ifneq "$(BUILDTOOL_AS_NLM)" "1"
+FILES_prebuild_headers += $(APRUTIL)/uri/uri_delims.h
+endif
     
 nlms :: $(APR)/aprlib.imp
 
@@ -46,7 +51,7 @@
 	@echo -I..\include >> $@
 	@echo -I..\include\arch\netware >> $@
 	@echo -I..\include\arch\unix >> $@
-	@echo -I..\..\apr-util\include >> $@
+	@echo -I$(APRUTIL)\include >> $@
 	@echo -ir $(NOVELLLIBC)\include >> $@
 
 $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw
@@ -69,6 +74,24 @@
 	@echo Creating $(subst /,\,$@)
 	copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
 
+ifneq "$(BUILDTOOL_AS_NLM)" "1"
+
+$(APRUTIL)/uri/uri_delims.h: gen_uri_delims.exe $(APRUTIL)/uri/gen_uri_delims.c
+	@echo Creating $(subst /,\,$@)
+	@$< > $@
+
+%.exe: $(APRUTIL)/uri/%.c
+	@echo Creating $@
+	@$(WIN_CC) $(WIN_CFLAGS) $< -o $@
+
+else
+
+ifneq "$(wildcard $(APRUTIL)/uri/uri_delims.h)" "$(APRUTIL)/uri/uri_delims.h"
+$(error Error: required header $(abspath $(APRUTIL)/uri/uri_delims.h) not found!)
+endif
+
+endif
+
 #
 # You can use this target if all that is needed is to copy files to the
 # installation area
@@ -88,4 +111,8 @@
 	$(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
+ifneq "$(BUILDTOOL_AS_NLM)" "1"
+	$(CHK) $(subst /,\,$(APRUTIL))\uri\uri_delims.h                 $(DEL) $(subst /,\,$(APRUTIL))\uri\uri_delims.h
+	$(CHK) gen_uri_delims.exe                                       $(DEL) gen_uri_delims.exe
+endif
     



Mime
View raw message