You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/06/12 17:28:08 UTC
svn commit: r667133 - /httpd/httpd/trunk/Makefile.win
Author: wrowe
Date: Thu Jun 12 08:28:08 2008
New Revision: 667133
URL: http://svn.apache.org/viewvc?rev=667133&view=rev
Log:
Additional fix up of command line .mak dbd module builds,
and optional .mak dbd IDE build.
Modified:
httpd/httpd/trunk/Makefile.win
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=667133&r1=667132&r2=667133&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Jun 12 08:28:08 2008
@@ -134,11 +134,10 @@
_trydbd:
!IF $(USEMAK) == 1
- cd srclib\apr-util\dbd & \
- for %d in ($(DBD_LIST)) do \
- $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
- cd ..
-
+ cd srclib\apr-util\dbd
+ for %d in ($(DBD_LIST)) do \
+ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..\..
!ELSEIF $(USESLN) == 1
for %d in ($(DBD_LIST)) do \
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
@@ -267,7 +266,14 @@
$(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ldap
$(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..\..
+ cd ..
+!IFDEF DBD_LIST
+ cd dbd
+ for %d in ($(DBD_LIST)) do \
+ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..
+!ENDIF
+ cd ..\..
cd srclib\pcre
$(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)