Return-Path: 
 <cvs-return-4848-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 79575 invoked by uid 500); 10 Mar 2003 23:45:30 -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 79554 invoked by uid 500); 10 Mar 2003 23:45:29 -0000
Delivered-To: apmail-apr-iconv-cvs@apache.org
Date: 10 Mar 2003 23:45:27 -0000
Message-ID: <20030310234527.12805.qmail@icarus.apache.org>
From: wrowe@apache.org
To: apr-iconv-cvs@apache.org
Subject: cvs commit: apr-iconv/build modules.mk.win
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

wrowe       2003/03/10 15:45:26

  Modified:    build    modules.mk.win
  Log:
    The install target copies *.so, *.pdb to the target.  Unfortunately,
    that grabed *_src.pdb as well, which should not be in the distribution.
  
    This patch creates a path/iconv/objs/ directory for all .obj and _src.pdb
    files which can be discarded with no problems.
  
  Revision  Changes    Path
  1.15      +7 -3      apr-iconv/build/modules.mk.win
  
  Index: modules.mk.win
  ===================================================================
  RCS file: /home/cvs/apr-iconv/build/modules.mk.win,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- modules.mk.win	10 Mar 2003 23:06:24 -0000	1.14
  +++ modules.mk.win	10 Mar 2003 23:45:26 -0000	1.15
  @@ -73,6 +73,7 @@
   APR_SOURCE   = ..\..\apr
   API_SOURCE   = ..
   OUTPUT_DIR   = $(API_SOURCE)\$(CFG_OUTPUT)
  +OBJ_DIR   = $(OUTPUT_DIR)\objs
   
   INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch" /YX"iconv.h"
   INT_INCLUDES = /I "$(API_SOURCE)\include" /I "$(API_SOURCE)\lib" \
  @@ -89,9 +90,12 @@
   
   .c{$(OUTPUT_DIR)}.so:
   	-$(SILENT)if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
  -	$(SILENT)echo Compiling $@...
  -	$(SILENT)cl $(ALL_CFLAGS) /Fo"$*.obj" /Fd"$*_src" $< \
  -		/link $(ALL_LDFLAGS) /out:$@ /base:@"..\build\BaseAddr.ref",$(@F) \
  +	-$(SILENT)if not exist "$(OBJ_DIR)\$(NULL)" mkdir "$(OBJ_DIR)"
  +	$(SILENT)echo Compiling $<... via $(OBJ_DIR)\$(@B).obj to $@
  +	$(SILENT)cl $(ALL_CFLAGS) /Fo"$(OBJ_DIR)\$(@B).obj" \
  +		/Fd"$(OBJ_DIR)\$(@B)_src" $< \
  +		/link $(ALL_LDFLAGS) /out:$@ \
  +		/base:@"..\build\BaseAddr.ref",$(@F) \
   		"$(API_LIB_PFX)apriconv.lib" "$(APR_LIB_PFX)apr.lib" \
   		kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
   	$(SILENT)echo.