Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 21 Dec 2000 01:32:44 -0000
Message-ID: <20001221013244.86988.qmail@locus.apache.org>
From: wrowe@locus.apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 Makefile.win

wrowe       00/12/20 17:32:44

  Modified:    .        Makefile.win
  Log:
    Back out the target path change from serverroot\bin back to serverroot
    for Apache.exe and it's associated lib*.dll files until after beta one.
    Change the make projects as well... and a commit of the actual .mak files
    will be coming in a moment.
  
  Revision  Changes    Path
  1.47      +14 -14    httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Makefile.win	2000/12/21 01:04:24	1.46
  +++ Makefile.win	2000/12/21 01:32:43	1.47
  @@ -59,17 +59,17 @@
   _build:
   	echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
   	cd srclib\apr
  -#	 aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp
  -	 $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +#	 aprlibdll creates the dynamic libapr.dll from the static library project apr.dsp
  +	 $(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-util
  -#	 aprutildll creates the dynamic apr-util.dll from the static library project aprutil.dsp
  +#	 libaprutil creates the dynamic libaprutil.dll from the static library project aprutil.dsp
   	 $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f aprutildll.mak CFG="aprutildll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd ..\..
   	cd srclib\expat-lite
  -	 $(MAKE) $(MAKEOPT) -f expatlib.mak CFG="expatlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd ..\..
   	cd srclib\pcre
   	 $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -81,9 +81,9 @@
   	 $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd ..
   	 -del Core$(SHORT)\buildmark.obj
  -#	 ApacheCoreDll creates the dynamic ApacheCore.dll from the static library project ApacheCore
  -	 $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +#	 libhttpd creates the dynamic libhttpd.dll from the static library project httpd
  +	 $(MAKE) $(MAKEOPT) -f httpd.mak CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	cd modules\aaa
   	 $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -140,11 +140,11 @@
   	-mkdir "$(INSTDIR)\logs"
   	-mkdir "$(INSTDIR)\modules"
   #	-mkdir "$(INSTDIR)\proxy"
  -	copy $(LONG)\Apache.exe "$(INSTDIR)\bin"
  -	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 $(LONG)\Apache.exe "$(INSTDIR)"
  +	copy $(LONG)\libhttpd.dll "$(INSTDIR)"
  +	copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)"
  +        copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)"
  +        copy srclib\expat-lite\$(LONG)\libexpat.dll "$(INSTDIR)"
           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"