apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r791610 - in /apr/apr/trunk/build: NWGNUenvironment.inc NWGNUmakefile NWGNUtail.inc make_nw_export.awk
Date Mon, 06 Jul 2009 20:51:56 GMT
Author: fuankg
Date: Mon Jul  6 20:51:56 2009
New Revision: 791610

URL: http://svn.apache.org/viewvc?rev=791610&view=rev
Log:
some more NetWare build improvements.

Modified:
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/build/NWGNUtail.inc
    apr/apr/trunk/build/make_nw_export.awk

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=791610&r1=791609&r2=791610&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Mon Jul  6 20:51:56 2009
@@ -77,6 +77,14 @@
 RELEASE = debug
 endif
 
+ifdef noopt
+RELEASE = noopt
+endif
+
+ifdef NOOPT
+RELEASE = noopt
+endif
+
 ifdef optimized
 RELEASE = release
 endif

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=791610&r1=791609&r2=791610&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Mon Jul  6 20:51:56 2009
@@ -31,7 +31,7 @@
 
 $(APR)/aprlib.imp : make_nw_export.awk nw_export.i
 	@echo Generating $@
-	$(AWK) -f $^ | sort >$@
+	$(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | sort >$@
     
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
 	@echo Generating $@
@@ -98,4 +98,11 @@
 	$(CHK) $(subst /,\,$(EXPAT_SRC))\config.h                   $(DEL) $(subst /,\,$(EXPAT_SRC))\config.h
 	$(CHK) $(subst /,\,$(EXPAT_SRC))\expat.h                    $(DEL) $(subst /,\,$(EXPAT_SRC))\expat.h
 #	$(CHK) $(subst /,\,$(APRXML))\expat_config.h                $(DEL) $(subst /,\,$(APRXML))\expat_config.h
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
     

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=791610&r1=791609&r2=791610&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Mon Jul  6 20:51:56 2009
@@ -83,6 +83,7 @@
 # Generic compiler rules
 #
 
+ifneq ($(MAKECMDGOALS),clean)
 $(APRBUILD)/NWGNUversion.inc : $(APRBUILD)/nw_ver.awk $(APR)/include/apr_version.h
 	@echo Generating $@
 	@$(AWK) -f $^ > $@
@@ -92,8 +93,10 @@
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(APRBUILD)/NWGNUversion.inc
 else
-VERSION		= 1,0,0
-VERSION_STR	= 1.0.0
+VERSION		= 2,0,0
+VERSION_STR	= 2.0.0
+endif
+VERSION_MAJMIN	= 20
 endif
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"

Modified: apr/apr/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/make_nw_export.awk?rev=791610&r1=791609&r2=791610&view=diff
==============================================================================
--- apr/apr/trunk/build/make_nw_export.awk (original)
+++ apr/apr/trunk/build/make_nw_export.awk Mon Jul  6 20:51:56 2009
@@ -2,7 +2,7 @@
 # based on Ryan Bloom's make_export.pl
 
 BEGIN {
-    printf(" (APRLIB)\n")
+    printf(" ("EXPPREFIX")\n")
 }
 
 # List of functions that we don't support, yet??



Mime
View raw message