httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0 Makefile.win
Date Fri, 19 Jul 2002 08:37:16 GMT
wrowe       2002/07/19 01:37:16

  Modified:    .        Makefile.win
  Log:
    apriconv from the command-line build
  
  Revision  Changes    Path
  1.111     +9 -11     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Makefile.win	18 Jul 2002 20:32:22 -0000	1.110
  +++ Makefile.win	19 Jul 2002 08:37:16 -0000	1.111
  @@ -31,20 +31,12 @@
   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 @@
   	 $(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 @@
   	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 @@
   	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
  
  
  

Mime
View raw message