svn commit: r1481040 - in /httpd/httpd/trunk: build/NWGNUhead.inc build/NWGNUtail.inc modules/NWGNUmakefile modules/session/NWGNUmakefile

[fu...@apache.org]

Author: fuankg
Date: Fri May 10 14:58:20 2013
New Revision: 1481040

URL: http://svn.apache.org/r1481040
Log:
Kill some NetWare build warnings.

Modified:
    httpd/httpd/trunk/build/NWGNUhead.inc
    httpd/httpd/trunk/build/NWGNUtail.inc
    httpd/httpd/trunk/modules/NWGNUmakefile
    httpd/httpd/trunk/modules/session/NWGNUmakefile

Modified: httpd/httpd/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUhead.inc?rev=1481040&r1=1481039&r2=1481040&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUhead.inc (original)
+++ httpd/httpd/trunk/build/NWGNUhead.inc Fri May 10 14:58:20 2013
@@ -82,9 +82,11 @@ clobber_prebuild ::
 
 $(SUBDIRS) : FORCE
 ifneq "$(MAKECMDGOALS)" "clean"
+ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"
 	@$(ECHONL)
 	@echo $(DL)Building $(CURDIR)/$@$(DL)
 endif
+endif
 	$(MAKE) -C $@ $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)"
 	@$(ECHONL)
 

Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=1481040&r1=1481039&r2=1481040&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Fri May 10 14:58:20 2013
@@ -95,9 +95,9 @@ CPPOPT_DEPENDS	= $(CCOPT_DEPENDS)
 # Generic compiler rules
 #
 
-ifneq ($(MAKECMDGOALS),clean)
+ifneq "$(MAKECMDGOALS)" "clean"
+ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"
 $(APBUILD)/NWGNUversion.inc: $(APBUILD)/nw_ver.awk $(SRC)/include/ap_release.h
-#	@echo Generating $@
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -f $^ > $@
 
@@ -111,6 +111,7 @@ VERSION_STR	= 2.3.0
 VERSION_MAJMIN	= 23
 endif
 endif
+endif
 
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"

Modified: httpd/httpd/trunk/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/NWGNUmakefile?rev=1481040&r1=1481039&r2=1481040&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/NWGNUmakefile Fri May 10 14:58:20 2013
@@ -13,12 +13,13 @@ include $(AP_WORK)/build/NWGNUenvironmen
 ifeq "$(wildcard $(APRUTIL)/include/apr_ldap.h)" "$(APRUTIL)/include/apr_ldap.h"
 WITH_LDAP = $(shell $(AWK) '/^\#define APR_HAS_LDAP /{print $$3}' $(APRUTIL)/include/apr_ldap.h)
 else
-ifeq "$(MAKECMDGOALS)" "clean"
 WITH_LDAP = 1
-else
+ifneq "$(MAKECMDGOALS)" "clean"
+ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"
 WITH_LDAP = 0
 endif
 endif
+endif
 
 # If USE_STDSOCKETS is defined we allways build mod_ssl
 ifdef USE_STDSOCKETS

Modified: httpd/httpd/trunk/modules/session/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/NWGNUmakefile?rev=1481040&r1=1481039&r2=1481040&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/session/NWGNUmakefile Fri May 10 14:58:20 2013
@@ -18,9 +18,11 @@ include $(AP_WORK)/build/NWGNUhead.inc
 #
 # Make sure all needed macro's are defined
 #
-ifneq ($(MAKECMDGOALS),clean)
+ifneq "$(MAKECMDGOALS)" "clean"
+ifneq "$(findstring clobber_,$(MAKECMDGOALS))" "clobber_"
 APU_HAVE_CRYPTO = $(shell $(AWK) '/^\#define APU_HAVE_CRYPTO/{print $$3}' $(APRUTIL)/include/apu.h)
 endif
+endif
 
 #
 # These directories will be at the beginning of the include list, followed by