diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2017-11-15 20:47:20 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2017-11-15 20:47:20 +0000 |
| commit | f833da3795b808fb911280d7f5ca4699f2ceb31f (patch) | |
| tree | afd12322bd16f55f50d710ce95bfe3fe2b1778e8 /Makefile.win | |
| parent | 0e295e2e1597209535eb34a4c33caa479dd9d776 (diff) | |
| download | httpd-f833da3795b808fb911280d7f5ca4699f2ceb31f.tar.gz | |
Follow up to r1815264
Get items in dsw files, BuildBin.dsp that didn't make 1815264
Make sure abs builds before a2md so applink.c in OpenSSL 1.1.0 gets copied
into same location as it exists in 1.0.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815370 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.win b/Makefile.win index 044ae5f302..69de1de1bd 100644 --- a/Makefile.win +++ b/Makefile.win @@ -648,12 +648,6 @@ _build: $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !IF EXIST("srclib\openssl") -!IF EXIST("srclib\jansson") && EXIST("srclib\curl") - cd modules\md - $(MAKE) $(MAKEOPT) $(SSLOPT) -f a2md.mak CFG="a2md - Win32 $(LONG)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET) - cd ..\.. -!ENDIF # cd modules\session # $(MAKE) $(MAKEOPT) -f mod_session_crypto.mak CFG="mod_session_crypto - Win32 $(LONG)" RECURSE=0 $(CTARGET) # cd ..\.. @@ -663,6 +657,12 @@ _build: cd support $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. +!IF EXIST("srclib\jansson") && EXIST("srclib\curl") + cd modules\md + $(MAKE) $(MAKEOPT) $(SSLOPT) -f a2md.mak CFG="a2md - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ENDIF !ENDIF cd support $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET) |