From 1ef0978c78568f0d9a2845d4f1da68c416a3506b Mon Sep 17 00:00:00 2001
From: Guenter Knauf <fuankg@apache.org>
Date: Fri, 10 May 2013 14:58:20 +0000
Subject: Kill some NetWare build warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481040 13f79535-47bb-0310-9956-ffa450edef68
---
 build/NWGNUhead.inc           | 2 ++
 build/NWGNUtail.inc           | 5 +++--
 modules/NWGNUmakefile         | 5 +++--
 modules/session/NWGNUmakefile | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index 78a96db7c6..2ef4dace6a 100644
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -82,8 +82,10 @@ 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)
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 0c4a92d571..674875f648 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -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"
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 7a344bc309..0cc2abdefd 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -13,12 +13,13 @@ include $(AP_WORK)/build/NWGNUenvironment.inc
 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
diff --git a/modules/session/NWGNUmakefile b/modules/session/NWGNUmakefile
index 8adaac59f9..85f3a3114f 100644
--- a/modules/session/NWGNUmakefile
+++ b/modules/session/NWGNUmakefile
@@ -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
-- 
cgit v1.2.3