Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 74419 invoked from network); 2 Jun 2008 19:31:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jun 2008 19:31:49 -0000 Received: (qmail 86101 invoked by uid 500); 2 Jun 2008 19:31:51 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 86070 invoked by uid 500); 2 Jun 2008 19:31:51 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 86061 invoked by uid 99); 2 Jun 2008 19:31:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2008 12:31:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2008 19:31:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 19DE62388A1B; Mon, 2 Jun 2008 12:31:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662530 - /apr/apr-util/branches/1.3.x/Makefile.win Date: Mon, 02 Jun 2008 19:31:26 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080602193126.19DE62388A1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Mon Jun 2 12:31:25 2008 New Revision: 662530 URL: http://svn.apache.org/viewvc?rev=662530&view=rev Log: Gracefully handle an empty DBD_LIST Backports: r662529 Modified: apr/apr-util/branches/1.3.x/Makefile.win Modified: apr/apr-util/branches/1.3.x/Makefile.win URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/Makefile.win?rev=662530&r1=662529&r2=662530&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/Makefile.win (original) +++ apr/apr-util/branches/1.3.x/Makefile.win Mon Jun 2 12:31:25 2008 @@ -190,16 +190,20 @@ cd ldap $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET) cd .. +!IFDEF DBD_LIST cd dbd for %d in ($(DBD_LIST)) do \ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET) cd .. +!ENDIF !ELSEIF $(USESLN) == 1 clean: +!IFDEF DBD_LIST -for %d in ($(DBD_LIST)) do \ devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_%d +!ENDIF -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_ldap -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil @@ -220,15 +224,19 @@ devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap +!IFDEF DBD_LIST for %d in ($(DBD_LIST)) do \ devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d +!ENDIF !ELSE # $(USEDSP) == 1 clean: +!IFDEF DBD_LIST -for %d in ($(DBD_LIST)) do \ msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN +!ENDIF -msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" /CLEAN -msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN -msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN @@ -249,8 +257,10 @@ @msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)" @msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" @msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" +!IFDEF DBD_LIST @for %d in ($(DBD_LIST)) do \ msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" +!ENDIF !ENDIF @@ -307,10 +317,12 @@ copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.pdb "$(PREFIX)\bin\" <.y copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.dll "$(PREFIX)\bin\" <.y copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y +!IFDEF DBD_LIST for %d in ($(DBD_LIST)) do ( \ copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.dll "$(PREFIX)\bin\" <.y && \ copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.pdb "$(PREFIX)\bin\" <.y \ ) +!ENDIF xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so "$(PREFIX)\bin\iconv\" /d < .a xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a del .y