On the trunk:

removed a2md from Windows makefile and .dsw

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816156 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 9ac2f79a9a85fdee7ee0aca9b3a370b17093d66f..45e008036b7ffaeaf95c6ecfd963cb01823c2f64 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -420,27 +420,6 @@ 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>

diff --git a/Apache.dsw b/Apache.dsw
index 055a3796022b91389453de466d29abe8d4018e86..c83f22890ef4cac4450291222d56a631bb25dde5 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -435,30 +435,6 @@ 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>

diff --git a/Makefile.win b/Makefile.win
index 69de1de1bd879cd2c351bbf8f5b63a523a302718..4ec79e9225e59aec52e27f24e99ec4a6afb9894c 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -280,16 +280,12 @@ _trymd:
 !IF $(USEMAK) == 1
        cd modules\md
        $(MAKE) $(MAKEOPT) $(SSLOPT) -f mod_md.mak CFG="mod_md - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-       $(MAKE) $(MAKEOPT) $(SSLOPT) -f a2md.mak CFG="a2md - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
 !ELSEIF $(USESLN) == 1
        devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_md
-       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project a2md
 !ELSE
        @msdev $(TLP).dsw /USEENV /MAKE \
                "mod_md - Win32 $(LONG)" /NORECURSE $(CTARGET)
-       @msdev $(TLP).dsw /USEENV /MAKE \
-               "a2md - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 !ELSE
@@ -297,7 +293,7 @@ _trymd:
 
 _trymd:
        @echo -----
-       @echo mod_md and a2md will not build unless OpenSSL, Jansson and Curl are built in placed
+       @echo mod_md not build unless OpenSSL, Jansson and Curl are built in placed
        @echo in srclib. Example: srclib/openssl, srclib/jansson and srclib/curl
 
 !ENDIF
@@ -659,7 +655,6 @@ _build:
        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
@@ -939,7 +934,6 @@ _copybin:
 !IF EXIST("srclib\openssl")
 !IF EXIST("srclib\jansson") &&  EXIST("srclib\curl")
        copy modules\md\$(LONG)\mod_md.$(src_so)                "$(inst_so)" <.y
-       copy modules\md\$(LONG)\a2md.$(src_exe)                 "$(inst_exe)" <.y
        -copy srclib\jansson\bin\jansson.$(src_dll)             "$(inst_dll)" <.y
        -copy srclib\curl\bin\libcurl.$(src_dll)                "$(inst_dll)" <.y
 !ENDIF