]> granicus.if.org Git - apache/commitdiff
Kill some NetWare build warnings.
authorGuenter Knauf <fuankg@apache.org>
Fri, 10 May 2013 14:58:20 +0000 (14:58 +0000)
committerGuenter Knauf <fuankg@apache.org>
Fri, 10 May 2013 14:58:20 +0000 (14:58 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481040 13f79535-47bb-0310-9956-ffa450edef68

build/NWGNUhead.inc
build/NWGNUtail.inc
modules/NWGNUmakefile
modules/session/NWGNUmakefile

index 78a96db7c6a37e1c2ba3e5a75cdf99e2177168a7..2ef4dace6ab017cbe2c49b3d45e76581cf199591 100644 (file)
@@ -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)
index 0c4a92d571de3acdb99f283fc36b9cc355fab97d..674875f64855ab9b00ffd7b27eb3ce2bcfa96668 100644 (file)
@@ -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"
index 7a344bc309eeacdf516e9d4440c52badf5d3b820..0cc2abdefd06813535b9c9769842abb8be44d084 100644 (file)
@@ -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
index 8adaac59f91e68af171e97f9963f1c0fbcde32d0..85f3a3114ffb86f8e9ed2724fa9ae03be2b29635 100644 (file)
@@ -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