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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 6182f98671592bc0ef034a50b2735a8eeef25f34..9ac2f79a9a85fdee7ee0aca9b3a370b17093d66f 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -420,6 +420,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "a2md"=.\modules\md\a2md.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abs
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "ab"=.\support\ab.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2185,6 +2206,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_md"=.\modules\md\mod_mmd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index 74a7051fab058bc55fce56444620399a0ebd2b20..055a3796022b91389453de466d29abe8d4018e86 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -435,6 +435,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "a2md"=.\modules\md\a2md.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name abs
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "ab"=.\support\ab.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2569,6 +2593,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_md"=.\modules\md\mod_mmd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/BuildBin.dsp b/BuildBin.dsp
index 84143ca124d16695f850b7b8350cf5e89ae6c3d7..0e13ddd46c4e53d67df96ea32b424202dd2b2b5c 100644 (file)
--- a/BuildBin.dsp
+++ b/BuildBin.dsp
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trymd _tryserf _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _tryserf _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trymd _tryserf _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"

diff --git a/Makefile.win b/Makefile.win
index 044ae5f302ac0bfa3ccfc5a67f84d81856a82a82..69de1de1bd879cd2c351bbf8f5b63a523a302718 100644 (file)
--- 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)

diff --git a/modules/md/mod_md.dsp b/modules/md/mod_md.dsp
index 3f8b9fdbdf41324b35be8a388f00de14f0e678f7..edc7f859c86fa964a89e051ab94115c595cb9ef7 100644 (file)
--- a/modules/md/mod_md.dsp
+++ b/modules/md/mod_md.dsp
@@ -157,7 +157,6 @@ SOURCE=./md_util.c
 # End Source File\r
 # Begin Source File\r
 \r
-\r
 SOURCE=./md_acme.c\r
 # End Source File\r
 # Begin Source File\r