diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2009-07-29 22:47:49 +0200 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2009-07-29 22:47:49 +0200 |
commit | ed6da4f1b9136fa382b0412ceaab466f437fb82a (patch) | |
tree | f29798b6143e607a65712d8e4b900539a7c99c0b /Makefile.win | |
parent | More 9x legacy (diff) | |
download | apache2-ed6da4f1b9136fa382b0412ceaab466f437fb82a.tar.xz apache2-ed6da4f1b9136fa382b0412ceaab466f437fb82a.zip |
Catch up to apr_dbm projects
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@799069 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
-rw-r--r-- | Makefile.win | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win index c61decc9b4..b80a60750b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -28,6 +28,12 @@ # # DBD_LIST="sqlite3 pgsql oracle mysql freetds" # +# Provide a DBM_LIST argument after configuring LIB and INCLUDE with +# the SDK paths of the corresponding client support libraries. +# The sdbm driver is always built in. +# +# DBM_LIST="db gdbm" +# # For example; # # nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr @@ -167,19 +173,27 @@ _trylua: !ENDIF -_trydbd: +_trydb: !IF $(USEMAK) == 1 cd srclib\apr-util\dbd for %d in (odbc $(DBD_LIST)) do \ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\dbm + for %d in ($(DBM_LIST)) do \ + $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\..\.. !ELSEIF $(USESLN) == 1 for %d in (odbc $(DBD_LIST)) do \ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d + for %d in ($(DBM_LIST)) do \ + devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbm_%d !ELSE @for %d in (odbc $(DBD_LIST)) do \ msdev Apache.dsw /USEENV /MAKE \ "apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET) + @for %d in ($(DBM_LIST)) do \ + msdev Apache.dsw /USEENV /MAKE \ + "apr_dbm_%d - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF @@ -296,6 +310,10 @@ _build: for %d in (odbc $(DBD_LIST)) do \ $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. + cd dbm + for %d in ($(DBM_LIST)) do \ + $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd .. cd ..\.. cd server $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -561,6 +579,9 @@ _copybin: for %d in (odbc $(DBD_LIST)) do ( \ copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \ ) + for %d in ($(DBM_LIST)) do ( \ + copy srclib\apr-util\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \ + ) copy srclib\pcre\pcre.$(src_dll) "$(inst_dll)" <.y copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) "$(inst_so)" <.y copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y |