diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2001-03-08 16:12:34 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2001-03-08 16:12:34 +0000 |
commit | f9ef03c36ded00d5ff7b72240679e7f158bba954 (patch) | |
tree | c0a658659acb8b94d571838d09e73e1ecec84ecf /Makefile.win | |
parent | 070a45985074bce7b1a835ad03a4db8bb8de1bd7 (diff) | |
download | httpd-f9ef03c36ded00d5ff7b72240679e7f158bba954.tar.gz |
Goodbye srclib/expat ... completes the build for srclib/apr-util/xml/expat
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88474 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
-rw-r--r-- | Makefile.win | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Makefile.win b/Makefile.win index 6685f6b75d..43a7a44639 100644 --- a/Makefile.win +++ b/Makefile.win @@ -65,11 +65,9 @@ _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\expat-lite - $(MAKE) $(MAKEOPT) -f expat.mak CFG="expat - Win32 $(LONG)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET) - cd ..\.. - cd srclib\apr-util + cd srclib\apr-util\xml\expat\lib + $(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\..\.. $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. @@ -144,7 +142,6 @@ _install: copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" - copy srclib\expat-lite\$(LONG)\libexpat.dll "$(INSTDIR)\bin" copy modules\aaa\$(LONG)\mod_auth_anon.so "$(INSTDIR)\modules" copy modules\aaa\$(LONG)\mod_auth_dbm.so "$(INSTDIR)\modules" copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules" @@ -181,9 +178,6 @@ A xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < << A << - xcopy srclib\expat-lite\*.h "$(INSTDIR)\include\xml" /d < << -A -<< xcopy srclib\pcre\*.h "$(INSTDIR)\include\pcre" /d < << A << @@ -198,8 +192,6 @@ A copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\libexec" copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\libexec" copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\libexec" - copy srclib\expat-lite\$(LONG)\libexpat.lib "$(INSTDIR)\libexec" - copy srclib\expat-lite\$(LONG)\libexpat.exp "$(INSTDIR)\libexec" copy $(LONG)\libhttpd.exp "$(INSTDIR)\libexec" copy $(LONG)\libhttpd.lib "$(INSTDIR)\libexec" copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\libexec" |