From cvs-return-5760-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Thu May 20 23:09:56 2004
Return-Path: <cvs-return-5760-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@www.apache.org
Received: (qmail 79404 invoked from network); 20 May 2004 23:09:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 20 May 2004 23:09:55 -0000
Received: (qmail 81692 invoked by uid 500); 20 May 2004 23:10:02 -0000
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 81516 invoked by uid 500); 20 May 2004 23:10:00 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 81360 invoked by uid 98); 20 May 2004 23:09:57 -0000
X-Qmail-Scanner-Mail-From: bnicholes@apache.org via hermes.apache.org
X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.59554 secs)
Date: 20 May 2004 23:09:24 -0000
Message-ID: <20040520230924.78938.qmail@minotaur.apache.org>
From: bnicholes@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/build NWGNUtail.inc
X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

bnicholes    2004/05/20 16:09:24

  Modified:    build    NWGNUtail.inc
  Log:
  Check for both multiple NLM or LIB targets before allowing the compiler options to be included
  
  Revision  Changes    Path
  1.11      +11 -0     apr/build/NWGNUtail.inc
  
  Index: NWGNUtail.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUtail.inc,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- NWGNUtail.inc	28 Apr 2004 20:40:22 -0000	1.10
  +++ NWGNUtail.inc	20 May 2004 23:09:24 -0000	1.11
  @@ -96,6 +96,15 @@
   VERSION_STR	= 1.0.0
   endif
   
  +ifeq "$(words $(strip $(TARGET_nlm)))" "1"
  +INCLUDE_BLDCMDS=1
  +endif
  +
  +ifeq "$(words $(strip $(TARGET_lib)))" "1"
  +INCLUDE_BLDCMDS=1
  +endif
  +
  +ifeq "$(INCLUDE_BLDCMDS)" "1"
   
   $(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
   	@echo Compiling $<
  @@ -149,6 +158,8 @@
   ifneq "$(strip $(XDEFINES))" ""
   	@echo $(XDEFINES) >> $@
   endif
  +
  +endif # one target nlm
   
   #
   # Rules to build libraries