You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bn...@apache.org on 2004/05/21 01:09:24 UTC

cvs commit: apr/build NWGNUtail.inc

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