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 Tue, 11 Mar 2003 00:18:54 GMT
wrowe       2003/03/10 16:18:53

  Modified:    .        Tag: APACHE_2_0_BRANCH Makefile.win
  Log:
    We cannot rename the library file as we've done or it will become
    disassociate with the source .pdb symbols, which is unplesant at
    the least.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.120.2.12 +8 -13     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.120.2.11
  retrieving revision 1.120.2.12
  diff -u -r1.120.2.11 -r1.120.2.12
  --- Makefile.win	19 Feb 2003 16:52:16 -0000	1.120.2.11
  +++ Makefile.win	11 Mar 2003 00:18:52 -0000	1.120.2.12
  @@ -558,18 +558,10 @@
   		inst_exe="$(INSTDIR)\bin"                              \
   		inst_dll="$(INSTDIR)\bin"                              \
   		inst_so="$(INSTDIR)\modules"
  -!IF "$(LONG)" == "Release"
  -	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
  -		_copybin src_exe=dbg src_dll=dbg src_so=dbg quiet="-"  \
  -		inst_exe="$(INSTDIR)\symbols\exe"                      \
  -		inst_dll="$(INSTDIR)\symbols\dll"                      \
  -		inst_so="$(INSTDIR)\symbols\so" 
  -!ENDIF
   	cd srclib\apr-iconv
  -	$(MAKE) $(MAKEOPT) -f build\modules.mk.win install symbols \
  +	$(MAKE) $(MAKEOPT) -f build\modules.mk.win install \
   		BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=. \
  -		INSTALL_DIR="$(INSTDIR)\bin\iconv" \
  -		SYMBOLS_DIR="$(INSTDIR)\symbols"
  +		INSTALL_DIR="$(INSTDIR)\bin\iconv"
   	cd ..\..
   	copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl" <.y
   	-awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
  @@ -595,12 +587,15 @@
   	xcopy srclib\apr-util\include\*.h 		"$(INSTDIR)\include" /d < .a
   	xcopy include\*.h 				"$(INSTDIR)\include" /d < .a
   	copy srclib\apr\Lib$(SHORT)\apr.lib 		"$(INSTDIR)\lib" <.y
  +	copy srclib\apr\Lib$(SHORT)\apr_src.pdb 	"$(INSTDIR)\lib" <.y
   	copy srclib\apr-util\Lib$(SHORT)\aprutil.lib 	"$(INSTDIR)\lib" <.y
  +	copy srclib\apr-util\Lib$(SHORT)\aprutil_src.pdb "$(INSTDIR)\lib" <.y
   	copy srclib\pcre\Lib$(SHORT)\pcre.lib 		"$(INSTDIR)\lib" <.y
  +	copy srclib\pcre\Lib$(SHORT)\pcre_src.pdb 	"$(INSTDIR)\lib" <.y
   	copy srclib\pcre\Lib$(SHORT)\pcreposix.lib 	"$(INSTDIR)\lib" <.y
  -#       ### until we determine if it's safe to change expat>libexpat and xml>expat
  -#       within our cvs tree... at least remain consistent to our naming conventions;
  -	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib" <.y
  +	copy srclib\pcre\Lib$(SHORT)\pcreposix_src.pdb 	"$(INSTDIR)\lib" <.y
  +	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib" <.y
  +	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml_src.pdb "$(INSTDIR)\lib" <.y
   	copy srclib\apr\$(LONG)\libapr.lib 		"$(INSTDIR)\lib" <.y
   	copy srclib\apr\$(LONG)\libapr.exp 		"$(INSTDIR)\lib" <.y
   	copy srclib\apr-iconv\$(LONG)\libapriconv.lib 	"$(INSTDIR)\lib" <.y
  
  
  

Mime
View raw message