Author: randyk
Date: Sun Feb 13 22:49:31 2005
New Revision: 153725
URL: http://svn.apache.org/viewcvs?view=rev&rev=153725
Log:
Adjust Makefiles to reflect the new directory structure
(work in progress).
Added:
httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak
Removed:
httpd/apreq/branches/multi-env-unstable/win32/mod_apreq.mak
httpd/apreq/branches/multi-env-unstable/win32/testall.mak
Modified:
httpd/apreq/branches/multi-env-unstable/win32/Configure.pl
httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak
httpd/apreq/branches/multi-env-unstable/win32/apreq2_win32.pl
httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak
httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak
Modified: httpd/apreq/branches/multi-env-unstable/win32/Configure.pl
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/Configure.pl?view=diff&r1=153724&r2=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/Configure.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/Configure.pl Sun Feb 13
22:49:31 2005
@@ -35,7 +35,7 @@
check_depends();
my @tests = qw(cookie parsers params version);
-my @test_files = map {catfile('t', "$_.t")} @tests;
+my @test_files = map {catfile('library', 't', "$_.t")} @tests;
generate_tests($apreq_home, [EMAIL PROTECTED]);
my %apr_libs;
@@ -348,7 +348,7 @@
sub generate_tests {
my ($top, $test_files) = @_;
- my $t = catdir $top, 't';
+ my $t = catdir $top, 'library', 't';
foreach my $test(@$test_files) {
my $file = catfile $t, $test;
open my $fh, '>', "$file.t" || die "Cannot open $file.t: $!";
@@ -412,7 +412,7 @@
LIBAPREQ=libapreq2
APREQ2_TEST=apreq2_test
CGITEST=test_cgi
-MOD=mod_apreq
+MOD=mod_apreq2
!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
@@ -446,7 +446,7 @@
PERLGLUE=$(APREQ_HOME)\glue\perl
APACHE_LIB=$(APACHE)\lib
APREQ_ENV=$(APREQ_HOME)\env
-TDIR=$(APREQ_HOME)\t
+TDIR=$(APREQ_HOME)\library\t
ALL : "$(LIBAPREQ)"
Modified: httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak?view=diff&r1=153724&r2=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak Sun Feb 13
22:49:31 2005
@@ -48,18 +48,18 @@
CPP=cl.exe
RSC=rc.exe
-CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\testall.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CFG_HOME=$(APREQ_HOME)\win32
-OUTDIR=$(CFG_HOME)\libs
-INTDIR=$(CFG_HOME)\libs
-TDIR=$(APREQ_HOME)\t
-PROGRAMS="$(TDIR)\params.exe" "$(TDIR)\version.exe" \
- "$(TDIR)\parsers.exe" "$(TDIR)\cookie.exe"
+LIBTDIR=$(APREQ_HOME)\library\t
+OUTDIR=$(LIBTDIR)
+INTDIR=$(LIBTDIR)
+LIBDIR=$(CFG_HOME)\libs
+PROGRAMS="$(LIBTDIR)\params.exe" "$(LIBTDIR)\version.exe" \
+ "$(LIBTDIR)\parsers.exe" "$(LIBTDIR)\cookie.exe"
!IF "$(CFG)" == "apreq2_test - Win32 Release"
-ALL : "$(OUTDIR)\apreq2_test.lib" $(PROGRAMS)
+ALL : "$(LIBDIR)\apreq2_test.lib" $(PROGRAMS)
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\at.obj"
@@ -69,17 +69,17 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"
/Fp"$(INTDIR)\apreq2_test.pch" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"
/Fp"$(INTDIR)\apreq2_test.pch" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include"
/YX /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /c
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apreq2_test.bsc"
+BSC32_FLAGS=/nologo /o"$(LIBDIR)\apreq2_test.bsc"
LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apreq2_test.lib"
+LIB32_FLAGS=/nologo /out:"$(LIBDIR)\apreq2_test.lib"
LIB32_OBJS= \
- "$(INTDIR)\at.obj" \
+ "$(LIBDIR)\at.obj" \
"$(APR_LIB)" \
"$(APU_LIB)"
-"$(OUTDIR)\apreq2_test.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+"$(LIBDIR)\apreq2_test.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
@@ -88,29 +88,29 @@
LINK32_FLAGS=kernel32.lib wsock32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /debug
/machine:I386 /pdbtype:sept
LINK32_OBJS= \
- "$(OUTDIR)\libapreq2.lib" \
- "$(OUTDIR)\apreq2_test.lib" \
+ "$(LIBDIR)\libapreq2.lib" \
+ "$(LIBDIR)\apreq2_test.lib" \
"$(APR_LIB)" \
"$(APU_LIB)" \
"$(APACHE)\lib\libhttpd.lib"
-"$(TDIR)\cookie.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\cookie.obj"
- $(LINK32) /pdb:"$(TDIR)\cookie.pdb" /out:"$(TDIR)\cookie.exe" @<<
+"$(LIBTDIR)\cookie.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\cookie.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\cookie.pdb" /out:"$(LIBTDIR)\cookie.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\cookie.obj"
<<
-"$(TDIR)\params.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\params.obj"
- $(LINK32) /pdb:"$(TDIR)\params.pdb" /out:"$(TDIR)\params.exe" @<<
+"$(LIBTDIR)\params.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\params.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\params.pdb" /out:"$(LIBTDIR)\params.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\params.obj"
<<
-"$(TDIR)\parsers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\parsers.obj"
- $(LINK32) /pdb:"$(TESTFILE)\parsers.pdb" /out:"$(TDIR)\parsers.exe" @<<
+"$(LIBTDIR)\parsers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\parsers.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\parsers.pdb" /out:"$(LIBTDIR)\parsers.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\parsers.obj"
<<
-"$(TDIR)\version.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\version.obj"
- $(LINK32) /pdb:"$(TDIR)\version.pdb" /out:"$(TDIR)\version.exe" @<<
+"$(LIBTDIR)\version.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\version.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\version.pdb" /out:"$(LIBTDIR)\version.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\version.obj"
<<
@@ -127,38 +127,38 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D
"_LIB" /Fp"$(INTDIR)\apreq2_test.pch" /YX /I"$(APACHE)\include"
/I"$(APREQ_HOME)\src" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D
"_LIB" /Fp"$(LIBDIR)\apreq2_test.pch" /YX /I"$(APACHE)\include"
/I"$(APREQ_HOME)\include" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /GZ /c
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apreq2_test.bsc"
+BSC32_FLAGS=/nologo /o"$(LIBDIR)\apreq2_test.bsc"
LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apreq2_test.lib"
+LIB32_FLAGS=/nologo /out:"$(LIBDIR)\apreq2_test.lib"
LIB32_OBJS= \
- "$(INTDIR)\at.obj" \
+ "$(LIBDIR)\at.obj" \
"$(APR_LIB)" \
"$(APU_LIB)"
-"$(OUTDIR)\apreq2_test.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+"$(LIBDIR)\apreq2_test.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-"$(TDIR)\cookie.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\cookie.obj"
- $(LINK32) /pdb:"$(TDIR)\cookie.pdb" /out:"$(TDIR)\cookie.exe" @<<
+"$(LIBTDIR)\cookie.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\cookie.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\cookie.pdb" /out:"$(LIBTDIR)\cookie.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\cookie.obj"
<<
-"$(TDIR)\params.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\params.obj"
- $(LINK32) /pdb:"$(TDIR)\params.pdb" /out:"$(TDIR)\params.exe" @<<
+"$(LIBTDIR)\params.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\params.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\params.pdb" /out:"$(LIBTDIR)\params.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\params.obj"
<<
-"$(TDIR)\parser.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\parser.obj"
- $(LINK32) /pdb:"$(TESTFILE)\parser.pdb" /out:"$(TDIR)\parser.exe" @<<
+"$(LIBTDIR)\parser.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\parser.obj"
+ $(LINK32) /pdb:"$(TESTFILE)\parser.pdb" /out:"$(LIBTDIR)\parser.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\parser.obj"
<<
-"$(TDIR)\version.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\version.obj"
- $(LINK32) /pdb:"$(TDIR)\version.pdb" /out:"$(TDIR)\version.exe" @<<
+"$(LIBTDIR)\version.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
"$(OUTDIR)\version.obj"
+ $(LINK32) /pdb:"$(LIBTDIR)\version.pdb" /out:"$(LIBTDIR)\version.exe" @<<
$(LINK32_FLAGS) $(LINK32_OBJS) "$(OUTDIR)\version.obj"
<<
@@ -205,33 +205,31 @@
!IF "$(CFG)" == "apreq2_test - Win32 Release" || "$(CFG)" == "apreq2_test -
Win32 Debug"
-SOURCE=t\at.c
-"$(INTDIR)\at.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=$(LIBTDIR)\at.c
+"$(LIBDIR)\at.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=t\cookie.c
+SOURCE=$(LIBTDIR)\cookie.c
"$(OUTDIR)\cookie.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=t\params.c
+SOURCE=$(LIBTDIR)\params.c
"$(OUTDIR)\params.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=t\parsers.c
+SOURCE=$(LIBTDIR)\parsers.c
"$(OUTDIR)\parsers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=t\version.c
+SOURCE=$(LIBTDIR)\version.c
"$(OUTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
!ENDIF
Modified: httpd/apreq/branches/multi-env-unstable/win32/apreq2_win32.pl
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/apreq2_win32.pl?view=diff&r1=153724&r2=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/apreq2_win32.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/apreq2_win32.pl Sun Feb 13
22:49:31 2005
@@ -57,7 +57,7 @@
$ap_dir{$_} = catdir $prefix, $_;
}
-my $src_version = catfile $apreq_home, 'src', 'apreq_version.h';
+my $src_version = catfile $apreq_home, 'include', 'apreq_version.h';
my $apache_version = catfile $ap_dir{include}, 'apreq_version.h';
my $apreq_version = -e $src_version ? $src_version : $apache_version;
Modified: httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak?view=diff&r1=153724&r2=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak Sun Feb 13
22:49:31 2005
@@ -53,6 +53,22 @@
CFG_HOME=$(APREQ_HOME)\win32
OUTDIR=$(CFG_HOME)\libs
INTDIR=$(CFG_HOME)\libs
+LIBDIR=$(APREQ_HOME)\library
+
+LINK32_OBJS= \
+ "$(INTDIR)\cookie.obj" \
+ "$(INTDIR)\param.obj" \
+ "$(INTDIR)\parser.obj" \
+ "$(INTDIR)\parser_header.obj" \
+ "$(INTDIR)\parser_multipart.obj" \
+ "$(INTDIR)\parser_urlencoded.obj" \
+ "$(INTDIR)\util.obj" \
+ "$(INTDIR)\version.obj" \
+ "$(INTDIR)\module.obj" \
+ "$(INTDIR)\module_custom.obj" \
+ "$(INTDIR)\module_cgi.obj" \
+ "$(APR_LIB)" \
+ "$(APU_LIB)"
!IF "$(CFG)" == "libapreq2 - Win32 Release"
@@ -61,23 +77,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src"
/Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include"
/Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:no /machine:I386
/out:"$(OUTDIR)\libapreq2.dll" /implib:"$(OUTDIR)\libapreq2.lib"
-LINK32_OBJS= \
- "$(INTDIR)\apreq.obj" \
- "$(INTDIR)\apreq_cookie.obj" \
- "$(INTDIR)\apreq_params.obj" \
- "$(INTDIR)\apreq_parsers.obj" \
- "$(INTDIR)\apreq_version.obj" \
- "$(INTDIR)\apreq_env.obj" \
- "$(INTDIR)\apreq_env_custom.obj" \
- "$(INTDIR)\apreq_env_cgi.obj" \
- "$(APR_LIB)" \
- "$(APU_LIB)"
"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -91,23 +96,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src"
/Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include"
/Fp"$(INTDIR)\libapreq2.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libapreq2.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\libapreq2.dll"
/implib:"$(OUTDIR)\libapreq2.lib" /pdbtype:sept
-LINK32_OBJS= \
- "$(INTDIR)\apreq.obj" \
- "$(INTDIR)\apreq_cookie.obj" \
- "$(INTDIR)\apreq_params.obj" \
- "$(INTDIR)\apreq_parsers.obj" \
- "$(INTDIR)\apreq_version.obj" \
- "$(INTDIR)\apreq_env.obj" \
- "$(INTDIR)\apreq_env_custom.obj" \
- "$(INTDIR)\apreq_env_cgi.obj" \
- "$(APR_LIB)" \
- "$(APU_LIB)"
"$(OUTDIR)\libapreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -148,48 +142,60 @@
!IF "$(CFG)" == "libapreq2 - Win32 Release" || "$(CFG)" == "libapreq2 - Win32
Debug"
-SOURCE=$(APREQ_HOME)\src\apreq.c
-"$(INTDIR)\apreq.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=$(LIBDIR)\cookie.c
+"$(INTDIR)\cookie.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_cookie.c
+SOURCE=$(LIBDIR)\param.c
-"$(INTDIR)\apreq_cookie.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\param.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=$(LIBDIR)\parser.c
+
+"$(INTDIR)\parser.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_params.c
+SOURCE=$(LIBDIR)\parser_header.c
-"$(INTDIR)\apreq_params.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\parser_header.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=$(LIBDIR)\parser_multipart.c
-SOURCE=$(APREQ_HOME)\src\apreq_parsers.c
+"$(INTDIR)\parser_multipart.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=$(LIBDIR)\parser_urlencoded.c
-"$(INTDIR)\apreq_parsers.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\parser_urlencoded.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=$(LIBDIR)\version.c
+
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_version.c
+SOURCE=$(LIBDIR)\module.c
-"$(INTDIR)\apreq_version.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\module.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_env.c
+SOURCE=$(LIBDIR)\module_custom.c
-"$(INTDIR)\apreq_env.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\module_custom.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_env_custom.c
+SOURCE=$(LIBDIR)\module_cgi.c
-"$(INTDIR)\apreq_env_custom.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\module_cgi.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=$(APREQ_HOME)\src\apreq_env_cgi.c
+SOURCE=$(LIBDIR)\util.c
-"$(INTDIR)\apreq_env_cgi.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
Added: httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak?view=auto&rev=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak (added)
+++ httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak Sun Feb 13
22:49:31 2005
@@ -0,0 +1,150 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on mod_apreq.dsp
+
+!IF "$(APACHE)" == ""
+!MESSAGE No Apache directory was specified.
+!MESSAGE This makefile is not to be run directly.
+!MESSAGE Please use Perl Makefile.PL, and then $(MAKE) on Makefile.
+!ERROR
+!ENDIF
+
+!IF "$(APR_LIB)" == ""
+!MESSAGE No apr lib was specified.
+!MESSAGE This makefile is not to be run directly.
+!MESSAGE Please use Perl Makefile.PL, and then $(MAKE) on Makefile.
+!ERROR
+!ENDIF
+
+!IF "$(APU_LIB)" == ""
+!MESSAGE No aprutil lib was specified.
+!MESSAGE This makefile is not to be run directly.
+!MESSAGE Please use Perl Makefile.PL, and then $(MAKE) on Makefile.
+!ERROR
+!ENDIF
+
+!IF "$(CFG)" == ""
+CFG=mod_apreq2 - Win32 Release
+!MESSAGE No configuration specified. Defaulting to mod_apreq2 - Win32 Release.
+!ENDIF
+
+!IF "$(CFG)" != "mod_apreq2 - Win32 Release" && "$(CFG)" != "mod_apreq2 -
Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_apreq2.mak" CFG="mod_apreq2 - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_apreq2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE "mod_apreq2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+CFG_HOME=$(APREQ_HOME)\win32
+OUTDIR=$(CFG_HOME)\libs
+INTDIR=$(CFG_HOME)\libs
+MODDIR=$(APREQ_HOME)\module\apache2
+
+LINK32_OBJS= \
+ "$(INTDIR)\handle.obj" \
+ "$(INTDIR)\filter.obj" \
+ "$(APR_LIB)" \
+ "$(APU_LIB)" \
+ "$(APACHE)\lib\libhttpd.lib" \
+ "$(OUTDIR)\libapreq2.lib"
+
+
+!IF "$(CFG)" == "mod_apreq2 - Win32 Release"
+
+ALL : "$(OUTDIR)\mod_apreq2.dll"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\include" /I"$(MODDIR)" /Fp"$(INTDIR)\mod_apreq2.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc"
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:no /machine:I386
/out:"$(OUTDIR)\mod_apreq2.so" /implib:"$(OUTDIR)\mod_apreq2.lib"
+"$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "mod_apreq2 - Win32 Debug"
+
+ALL : "$(OUTDIR)\mod_apreq2.dll"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\include" /I"$(MODDIR)" /Fp"$(INTDIR)\mod_apreq2.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc"
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\mod_apreq2.pdb"
/debug /machine:I386 /out:"$(OUTDIR)\mod_apreq2.so"
/implib:"$(OUTDIR)\mod_apreq2.lib" /pdbtype:sept
+"$(OUTDIR)\mod_apreq2.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(CFG)" == "mod_apreq2 - Win32 Release" || "$(CFG)" == "mod_apreq2 -
Win32 Debug"
+
+SOURCE=$(MODDIR)\filter.c
+
+"$(INTDIR)\filter.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=$(MODDIR)\handle.c
+
+"$(INTDIR)\handle.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ENDIF
+
Modified: httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak
URL:
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak?view=diff&r1=153724&r2=153725
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak Sun Feb 13
22:49:31 2005
@@ -58,7 +58,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\test_cgi.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /Fp"$(INTDIR)\test_cgi.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -114,7 +114,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"
/D "_MBCS" /I"$(APACHE)\include" /I"$(APREQ_HOME)\src"
/Fp"$(INTDIR)\test_cgi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"
/D "_MBCS" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include"
/Fp"$(INTDIR)\test_cgi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -167,7 +167,7 @@
!IF "$(CFG)" == "test_cgi - Win32 Release" || "$(CFG)" == "test_cgi - Win32
Debug"
-SOURCE=$(APREQ_HOME)\env\test_cgi.c
+SOURCE=$(APREQ_HOME)\module\test_cgi.c
"$(INTDIR)\test_cgi.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
