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 78a96db7c6a37e1c2ba3e5a75cdf99e2177168a7..2ef4dace6ab017cbe2c49b3d45e76581cf199591 100644 (file)
--- 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 2e83d6ebbfbacb26b2f23d0db17986e5f321cbeb..e707672df74e02c4691edcdb6c91ba2c5ddd25a6 100644 (file)
--- 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 cbcf89d7cebf71a721d123424feb6e414fa7f0aa..c897d7ed88c57953b669c2bf9d7a7a4dbbd12700 100644 (file)
--- 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