diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-07-19 10:37:16 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-07-19 10:37:16 +0200 |
| commit | 19a112f2d87f887a9c2f777e95c3df2b2d9c4dfe (patch) | |
| tree | fe4275c4f5db1b3ad230bb6e6c9ec6c5b3feadb3 /Makefile.win | |
| parent | Start building apr-iconv with apr and apr-util for Windows. (diff) | |
| download | apache2-19a112f2d87f887a9c2f777e95c3df2b2d9c4dfe.tar.xz apache2-19a112f2d87f887a9c2f777e95c3df2b2d9c4dfe.zip | |
apriconv from the command-line build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96120 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Makefile.win b/Makefile.win index 0540666921..8589712956 100644 --- a/Makefile.win +++ b/Makefile.win @@ -31,20 +31,12 @@ default: _apacher CTARGET=/build !ENDIF -!IF !EXIST("srclib\apr") +!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv") !MESSAGE Please check out or download and unpack the Apache Portability Runtime -!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory. +!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir. !MESSAGE Apache cannot build without these libraries! !MESSAGE -!ERROR Need $(INSTDIR)\srclib\apr -!ENDIF - -!IF !EXIST("srclib\apr-util") -!MESSAGE Please check out or download and unpack the Apache Portability Runtime -!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory. -!MESSAGE Apache cannot build without these libraries! -!MESSAGE -!ERROR Need $(INSTDIR)\srclib\apr-util +!ERROR Need $(INSTDIR)\srclib\ apr, apr-iconv and apr-util !ENDIF # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up' @@ -182,6 +174,10 @@ _build: $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. + cd srclib\apr-iconv + $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. cd srclib\apr-util\uri $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\..\.. @@ -360,6 +356,7 @@ _install: copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y + copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y @@ -407,6 +404,7 @@ _install: copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y + copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y |