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, 14 Jan 2003 18:28:27 GMT
wrowe       2003/01/14 10:28:27

  Modified:    .        Tag: APACHE_2_0_BRANCH Makefile.win
  Log:
    Adapt to Brane's apr-iconv patch that provides for make install, and makes
    httpd a little less intimate with apr internals.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.120.2.3 +24 -7     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.120.2.2
  retrieving revision 1.120.2.3
  diff -u -r1.120.2.2 -r1.120.2.3
  --- Makefile.win	3 Dec 2002 06:19:51 -0000	1.120.2.2
  +++ Makefile.win	14 Jan 2003 18:28:27 -0000	1.120.2.3
  @@ -177,11 +177,19 @@
   	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 ccs
  -	  $(MAKE) $(MAKEOPT) -f Makefile.win BUILD_TYPE=$(SHORT)DD
  -	 cd ..\ces
  -	  $(MAKE) $(MAKEOPT) -f Makefile.win BUILD_TYPE=$(SHORT)DD
  -	cd ..\..\..
  +!IF "$(CTARGET)" == "CLEAN"
  +	$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
  +		BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
  +!ELSE
  +	cd ccs
  +	$(MAKE) /nologo /f Makefile.win all \
  +		BUILD_MODE=$(LONG) BIND_MODE=shared
  +	cd ..\ces
  +	$(MAKE) /nologo /f Makefile.win all \
  +		BUILD_MODE=$(LONG) BIND_MODE=shared
  +	cd ..
  +!ENDIF
  +	cd ..\..
   	cd srclib\apr-util\uri
   	 $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak  CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..\..
  @@ -325,6 +333,12 @@
   	@echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
   	@msdev Apache.dsw /USEENV /MAKE \
   		"BuildBin - Win32 $(LONG)" $(CTARGET)
  +!IF "$(CTARGET)" == "/CLEAN"
  +	@cd srclib\apr-iconv
  +	@$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
  +		BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
  +	@cd ..\..
  +!ENDIF
   !IF EXIST("srclib\openssl")
   	@msdev Apache.dsw /USEENV /MAKE \
   		"mod_ssl - Win32 $(LONG)" \
  @@ -363,8 +377,11 @@
   	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-iconv\ccs\$(LONG)\*.so "$(INSTDIR)\bin\iconv" <.y
  -	copy srclib\apr-iconv\ces\$(LONG)\*.so "$(INSTDIR)\bin\iconv" <.y
  +	cd srclib\apr-iconv
  +	$(MAKE) $(MAKEOPT) /f build\modules.mk.win install \
  +		BUILD_MODE=$(LONG) BIND_MODE=shared \
  +		API_SOURCE=. INSTALL_DIR="$(INSTDIR)\bin\iconv"
  +	cd ..\..
   	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
  
  
  

Mime
View raw message