apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r791168 - in /apr/apr/branches/0.9.x/build: NWGNUenvironment.inc NWGNUtail.inc
Date Sat, 04 Jul 2009 19:01:29 GMT
Author: fuankg
Date: Sat Jul  4 19:01:28 2009
New Revision: 791168

URL: http://svn.apache.org/viewvc?rev=791168&view=rev
Log:
backport some NetWare build fixes needed to compile tests properly.

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

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=791168&r1=791167&r2=791168&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/0.9.x/build/NWGNUenvironment.inc Sat Jul  4 19:01:28 2009
@@ -106,16 +106,19 @@
 #
 
 # MetroWerks NLM tools
-CC		= mwccnlm
-CPP		= mwccnlm
+CC	= mwccnlm
+CPP	= mwccnlm
 LINK	= mwldnlm
-LIB		= mwldnlm -type library -w nocmdline
+LIB	= mwldnlm -type library -w nocmdline
+
+# Setup build tools
+AWK	= awk
 
 NOVI	= $(NOVELLLIBC)\imports
 
-INCDIRS 	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
+INCDIRS	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
 
-DEFINES		= -DNETWARE
+DEFINES	= -DNETWARE
 ifndef DEBUG
 DEFINES += -DNDEBUG
 endif

Modified: apr/apr/branches/0.9.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/build/NWGNUtail.inc?rev=791168&r1=791167&r2=791168&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/NWGNUtail.inc (original)
+++ apr/apr/branches/0.9.x/build/NWGNUtail.inc Sat Jul  4 19:01:28 2009
@@ -83,19 +83,30 @@
 # Generic compiler rules
 #
 
-$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h
 	@echo Generating $(subst /,\,$@)
-	awk -f $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h > $(APR_WORK)\build\NWGNUversion.inc
+	@$(AWK) -f $^ > $@
 
 -include $(APR_WORK)\build\NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
 else
-VERSION		= 1,0,0
-VERSION_STR	= 1.0.0
+VERSION		= 0,9,0
+VERSION_STR	= 0.9.0
+endif
 endif
 
+ifeq "$(words $(strip $(TARGET_nlm)))" "1"
+INCLUDE_BLDCMDS=1
+endif
+
+ifeq "$(words $(strip $(TARGET_lib)))" "1"
+INCLUDE_BLDCMDS=1
+endif
+
+ifeq "$(words $(strip $(TARGET_nlm)))" "1"
 
 $(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo Compiling $<
@@ -150,6 +161,8 @@
 	@echo $(XDEFINES) >> $@
 endif
 
+endif # one target nlm
+
 #
 # Rules to build libraries
 #



Mime
View raw message