Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r667378 - /apr/apr-util/trunk/Makefile.win
Date: Fri, 13 Jun 2008 06:33:07 -0000
To: commits@apr.apache.org
From: wrowe@apache.org
Message-Id: <20080613063307.282312388A1B@eris.apache.org>

Author: wrowe
Date: Thu Jun 12 23:33:06 2008
New Revision: 667378

URL: http://svn.apache.org/viewvc?rev=667378&view=rev
Log:
Actually this is much simpler to read when we simply
force odbc in the list to iterate and drop the tests
for the presence of DBD_LIST

Modified:
    apr/apr-util/trunk/Makefile.win

Modified: apr/apr-util/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/Makefile.win?rev=667378&r1=667377&r2=667378&view=diff
==============================================================================
--- apr/apr-util/trunk/Makefile.win (original)
+++ apr/apr-util/trunk/Makefile.win Thu Jun 12 23:33:06 2008
@@ -192,21 +192,15 @@
 	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ..
 	cd dbd
-	$(MAKE) $(MAKEOPT) -f apr_dbd_odbc.mak CFG="apr_dbd_odbc - $(ARCH)" RECURSE=0 $(CTARGET)
-!IFDEF DBD_LIST
-	  for %d in ($(DBD_LIST)) do \
+	  for %d in (odbc $(DBD_LIST)) do \
 	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET)
-!ENDIF
 	cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
-	devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_odbc
-!IFDEF DBD_LIST
-	-for %d in ($(DBD_LIST)) do \
+	-for %d in (odbc $(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
@@ -227,21 +221,15 @@
 	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
-	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_odbc
-!IFDEF DBD_LIST
-	for %d in ($(DBD_LIST)) do \
+	for %d in (odbc $(DBD_LIST)) do \
 	  devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d
-!ENDIF
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
-	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_odbc - $(ARCH)" /CLEAN
-!IFDEF DBD_LIST
-	-for %d in ($(DBD_LIST)) do \
+	-for %d in (odbc $(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
@@ -262,11 +250,8 @@
 	@msdev aprutil.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)"
-	msdev aprutil.dsw /USEENV /MAKE "apr_dbd_odbc - $(ARCH)"
-!IFDEF DBD_LIST
-	@for %d in ($(DBD_LIST)) do \
+	@for %d in (odbc $(DBD_LIST)) do \
 	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)"
-!ENDIF
 
 !ENDIF
 
@@ -323,14 +308,10 @@
 	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
-	copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_odbc-1.dll "$(PREFIX)\bin\" <.y && \
-	copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_odbc-1.pdb "$(PREFIX)\bin\" <.y \
-!IFDEF DBD_LIST
-	for %d in ($(DBD_LIST)) do ( \
+	for %d in (odbc $(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