At 08:24 PM 1/17/2003, [EMAIL PROTECTED] wrote:
>wrowe 2003/01/17 18:24:46
>
> Modified: . Tag: APACHE_2_0_BRANCH Makefile.win
> Log:
> Damned... this was broken but, since most of us build from .dsp files,
> it was never noted. I intend to package this patch into the Win32 .zip
> source distribution, by virtue that all of the .mak files (what triggers
> this build line anyways) are only generated once preparing the win32 .zip
> source package.
Well, after generating the .mak/.dep/.rc files for Win32 and having applied
this one-liner to Makefile.win, I've zipped up the package and have it going
up to dadelus right now.
Note that anyone checking out the APACHE_2_0_44 tag has no .mak files
in the first place, so this build problem isn't triggered. The Makefile.win
will build directly from the Apache.dsw project workspace *unless* it finds
.mak files lying around.
The .mak files only directly benefit our VC5.0 users.
If folks feel this is grounds for scrapping .44 and moving to .45 then fine,
I have no issues with that. But I also don't feel that we must do so,
given that the entire .mak schema is a manual, after-the-tag process.
Bill
--- Makefile.win 15 Jan 2003 15:13:35 -0000 1.120.2.4
+++ Makefile.win 18 Jan 2003 02:24:46 -0000 1.120.2.5
@@ -233,12 +233,12 @@
$(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32
$(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
cd ..\..
cd modules\filters
!IF EXIST("srclib\zlib")
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
!ENDIF
+ $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
cd ..\..
cd modules\generators
