no AuthzLDAPAuthoritative in trunk, because authz uses a provider API

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index a8a1d1d644d4c1a834aebecfc0343cdb63c2c6f7..bea09bc0879394fb86f9def1635b40bb15c0c7b3 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -134,11 +134,10 @@ _tryzlib:
 
 _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
@@ -265,9 +264,16 @@ _build:
        cd ..\..\..
         $(MAKE) $(MAKEOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        cd ldap
-        $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
-        cd ..\..\..
+       cd ldap
+        $(MAKE) $(MAKEOPT) -f apr_ldap.mak        CFG="apr_ldap - Win32 $(LONG)" 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 - 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)
@@ -511,7 +517,7 @@ _copybin:
        copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
 !IFDEF DBD_LIST
        for %d in ($(DBD_LIST)) do ( \
-         copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
+         copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
        )
 !ENDIF
        copy modules\aaa\$(LONG)\mod_access_compat.$(src_so)    "$(inst_so)" <.y
@@ -705,6 +711,7 @@ BEGIN {
  support for the patented encryption methods IDEA, MDC-2 or RC5.
 
 --------------------------------------------------------------------------------
+
 <<
        -copy "$(INSTDIR)\OPENSSL-NEWS.txt" \
            + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt"