From: Guenter Knauf <fuankg@apache.org>
Date: Fri, 10 May 2013 15:33:21 +0000 (+0000)
Subject: Kill some NetWare build warnings (backport r1481040).
X-Git-Tag: 2.2.25~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3254268a66f6546779241dd22762e88855709810;p=thirdparty%2Fapache%2Fhttpd.git

Kill some NetWare build warnings (backport r1481040).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1481055 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index 78a96db7c6a..2ef4dace6ab 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 2e83d6ebbfb..e707672df74 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.2.0
 VERSION_MAJMIN	= 22
 endif
 endif
+endif
 
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index cbcf89d7ceb..c897d7ed88c 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -11,12 +11,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