You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2013/05/10 17:33:21 UTC
svn commit: r1481055 - in /httpd/httpd/branches/2.2.x: build/NWGNUhead.inc
build/NWGNUtail.inc modules/NWGNUmakefile
Author: fuankg
Date: Fri May 10 15:33:21 2013
New Revision: 1481055
URL: http://svn.apache.org/r1481055
Log:
Kill some NetWare build warnings (backport r1481040).
Modified:
httpd/httpd/branches/2.2.x/build/NWGNUhead.inc
httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
httpd/httpd/branches/2.2.x/modules/NWGNUmakefile
Modified: httpd/httpd/branches/2.2.x/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUhead.inc?rev=1481055&r1=1481054&r2=1481055&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUhead.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUhead.inc Fri May 10 15:33:21 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/branches/2.2.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUtail.inc?rev=1481055&r1=1481054&r2=1481055&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUtail.inc Fri May 10 15:33:21 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.2.0
VERSION_MAJMIN = 22
endif
endif
+endif
ifeq "$(words $(strip $(TARGET_nlm)))" "1"
Modified: httpd/httpd/branches/2.2.x/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/NWGNUmakefile?rev=1481055&r1=1481054&r2=1481055&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/NWGNUmakefile Fri May 10 15:33:21 2013
@@ -11,12 +11,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