diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2011-11-03 00:01:55 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2011-11-03 00:01:55 +0000 |
| commit | 47086436860bcf5110fcc3ee9a1461383a86963c (patch) | |
| tree | b2c9d80a7ef5828c4be7476594d8608e2a8cb67d /Makefile.win | |
| parent | 18e5fd007eddf4b6f232d1e85ca6e80a13773269 (diff) | |
| download | httpd-47086436860bcf5110fcc3ee9a1461383a86963c.tar.gz | |
Added proxy_html and xml2enc to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index bac5221822..1a54237f97 100644 --- a/Makefile.win +++ b/Makefile.win @@ -187,6 +187,35 @@ _tryzlib: !ENDIF +!IF EXIST("srclib\libxml2") + +_tryxml: +!IF $(USEMAK) == 1 + cd modules\filters + $(MAKE) $(MAKEOPT) -f mod_proxy_html.mak CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_xml2enc.mak CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\libxml2") + +_tryxml: + @echo ----- + @echo mod_proxy_html and mod_xml2enc will not build unless libxml2 is + @echo built in srclib\libxml2. Version 2.7.7 and later available from + @echo http://xmlsoft.org/ will satisfy this requirement. + +!ENDIF + !IF EXIST("srclib\lua") @@ -453,6 +482,10 @@ _build: $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_filter.mak CFG="mod_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!IF EXIST("srclib\libxml2") + $(MAKE) $(MAKEOPT) -f mod_proxy_html.mak CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_xml2enc.mak CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF $(MAKE) $(MAKEOPT) -f mod_ratelimit.mak CFG="mod_ratelimit - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_reflector.mak CFG="mod_reflector - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_reqtimeout.mak CFG="mod_reqtimeout - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -591,6 +624,10 @@ _build: !IF EXIST("srclib\lua") devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_lua !ENDIF +!IF EXIST("srclib\libxml2") + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc +!ENDIF !ELSE @@ -630,6 +667,12 @@ _build: @msdev $(TLP).dsw /USEENV /MAKE \ "mod_lua - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF +!IF EXIST("srclib\libxml2") + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF !ENDIF @@ -709,6 +752,13 @@ _copybin: copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_filter.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_include.$(src_so) "$(inst_so)" <.y +!IF EXIST("srclib\libxml2") + copy modules\filters\$(LONG)\mod_proxy_html.$(src_so) "$(inst_so)" <.y + copy modules\filters\$(LONG)\mod_xml2enc.$(src_so) "$(inst_so)" <.y +!IF EXIST("srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll)") + copy srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll) "$(inst_dll)" <.y +!ENDIF +!ENDIF copy modules\filters\$(LONG)\mod_ratelimit.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_reflector.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_reqtimeout.$(src_so) "$(inst_so)" <.y |