randyk 2003/07/20 17:46:44
Modified: win32 Configure.pl libapreq.mak libapreq_cgi.mak
mod_apreq.mak testall.mak
Log:
Clean up of conversion of relative to absolute paths, and make
the httpd-apreq-2 source directory the "home" base (where
the main Makefile will be generated).
Revision Changes Path
1.11 +39 -33 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Configure.pl 20 Jul 2003 19:04:38 -0000 1.10
+++ Configure.pl 21 Jul 2003 00:46:43 -0000 1.11
@@ -4,13 +4,15 @@
use FindBin;
use Getopt::Long;
require File::Spec;
+use Cwd;
require Win32;
use ExtUtils::MakeMaker;
use File::Basename;
-my ($apache, $debug, $help, $no_perl);
-my $result = GetOptions( 'with-apache=s' => \$apache,
+my ($apache, $debug, $help, $no_perl, $perl);
+my $result = GetOptions( 'with-apache2=s' => \$apache,
'debug' => \$debug,
'help' => \$help,
+ 'with-perl=s' => \$perl,
'without-perl' => \$no_perl,
);
usage() if $help;
@@ -18,8 +20,9 @@
my @path_ext;
path_ext();
$apache ||= search();
-my $cfg_home = Win32::GetShortPathName($FindBin::Bin);
-$cfg_home =~ s!/!\\!g;
+my $apreq_home = Win32::GetShortPathName($FindBin::Bin);
+$apreq_home =~ s!/?win32$!!;
+$apreq_home =~ s!/!\\!g;
my $doxygen = which('doxygen');
my $cfg = $debug ? 'Debug' : 'Release';
@@ -30,10 +33,10 @@
warn "ExtUtils::XSBuilder must be installed for Perl glue\n";
}
else {
- my @args = ($^X, '../../build/xsbuilder.pl', 'run', 'run');
- chdir '../glue/perl';
- system(@args) == 0 or die "system @args failed: $!";
- chdir '../../win32';
+ my @args = ($^X, "$apreq_home/build/xsbuilder.pl", 'run', 'run');
+ chdir "$apreq_home/glue/perl";
+ system(@args) == 0 or die "($apreq_home ) system @args failed: $?";
+ chdir $apreq_home;
}
}
@@ -41,11 +44,12 @@
print $make <<"END";
# Microsoft Developer Studio Generated NMAKE File.
-CFG_HOME=$cfg_home
+APREQ_HOME=$apreq_home
CFG=$cfg
APACHE=$apache
PERL=$^X
RM_F=\$(PERL) -MExtUtils::Command -e rm_f
+DOXYGEN_CONF=\$(APREQ_HOME)\\build\\doxygen.conf.win32
END
@@ -54,18 +58,18 @@
if ($doxygen) {
print $make <<"END";
-docs:
- cd \$(CFG_HOME)\\..
- "$doxygen" build\\doxygen.conf.win32
- cd \$(CFG_HOME)
+docs: \$(DOXYGEN_CONF)
+ cd \$(APREQ_HOME)
+ "$doxygen" \$(DOXYGEN_CONF)
+ cd \$(APREQ_HOME)
END
my $bin_abspath = Win32::GetShortPathName(dirname(which('doxysearch')));
- open(my $conf, '../build/doxygen.conf')
- or die "Cannot read ../build/doxygen.conf: $!";
- open(my $win32_conf, '>../build/doxygen.conf.win32')
- or die "Cannot write to ../build/doxygen.conf.win32: $!";
+ open(my $conf, "$apreq_home/build/doxygen.conf")
+ or die "Cannot read $apreq_home/build/doxygen.conf: $!";
+ open(my $win32_conf, ">$apreq_home/build/doxygen.conf.win32")
+ or die "Cannot write to $apreq_home/build/doxygen.conf.win32: $!";
while (<$conf>) {
s/^(PERL_PATH\s+=\s+).*/$1"$^X"/;
s/^(BIN_ABSPATH\s+=\s+).*/$1$bin_abspath/;
@@ -78,9 +82,10 @@
close $make;
generate_defs();
-print << 'END';
+print << "END";
-A Makefile has been generated. You can now run
+A Makefile has been generated in $apreq_home.
+You can now run
nmake - builds the libapreq library
nmake test - runs the supplied tests
@@ -100,12 +105,12 @@
sub usage {
print <<'END';
- Usage: perl Configure.pl [--with-apache=C:\Path\to\Apache2] [--debug]
+ Usage: perl Configure.pl [--with-apache2=C:\Path\to\Apache2] [--debug]
perl Configure.pl --help
Options:
- --with-apache=C:\Path\to\Apache2 : specify the top-level Apache2 directory
+ --with-apache2=C:\Path\to\Apache2 : specify the top-level Apache2 directory
--debug : build a debug version
--without-perl : skip initializing the perl glue
--help : print this help message
@@ -156,7 +161,7 @@
die <<'END';
Please run this configuration script again, and give
-the --with-apache=C:\Path\to\Apache2 option to specify
+the --with-apache2=C:\Path\to\Apache2 option to specify
the desired top-level Apache2 directory.
END
@@ -222,7 +227,7 @@
EXPORTS
END
- chdir '../env';
+ chdir "$apreq_home/env";
my $match = qr{^apreq_env};
foreach my $file(qw(mod_apreq libapreq_cgi)) {
my %fns = ();
@@ -278,41 +283,42 @@
NULL=nul
!ENDIF
+CFG_HOME=$(APREQ_HOME)\win32
LIBDIR=$(CFG_HOME)\libs
-PERLGLUE=$(CFG_HOME)\..\glue\perl
+PERLGLUE=$(APREQ_HOME)\glue\perl
ALL : "$(LIBAPREQ)"
$(LIBAPREQ):
- $(MAKE) /nologo /f $(CFG_HOME)\$(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32
$(CFG)" APACHE="$(APACHE)"
+ $(MAKE) /nologo /f $(CFG_HOME)\$(LIBAPREQ).mak CFG="$(LIBAPREQ) - Win32
$(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
CLEAN:
cd $(LIBDIR)
$(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj
- cd $(CFG_HOME)
+ cd $(APREQ_HOME)
!IF EXIST("$(PERLGLUE)\Makefile")
cd $(PERLGLUE)
$(MAKE) /nologo clean
- cd $(CFG_HOME)
+ cd $(APREQ_HOME)
!ENDIF
TEST: $(LIBAPREQ)
- $(MAKE) /nologo /f $(CFG_HOME)\$(TESTALL).mak CFG="$(TESTALL) - Win32
$(CFG)" APACHE="$(APACHE)"
+ $(MAKE) /nologo /f $(CFG_HOME)\$(TESTALL).mak CFG="$(TESTALL) - Win32
$(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
set PATH=%PATH%;$(APACHE)\bin
cd $(LIBDIR) && $(TESTALL).exe -v
- cd $(CFG_HOME)
+ cd $(APREQ_HOME)
$(MOD): $(LIBAPREQ)
- $(MAKE) /nologo /f $(CFG_HOME)\$(MOD).mak CFG="$(MOD) - Win32 $(CFG)"
APACHE="$(APACHE)"
+ $(MAKE) /nologo /f $(CFG_HOME)\$(MOD).mak CFG="$(MOD) - Win32 $(CFG)"
APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
$(CGI): $(LIBAPREQ)
- $(MAKE) /nologo /f $(CFG_HOME)\$(CGI).mak CFG="$(CGI) - Win32 $(CFG)"
APACHE="$(APACHE)"
+ $(MAKE) /nologo /f $(CFG_HOME)\$(CGI).mak CFG="$(CGI) - Win32 $(CFG)"
APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)"
PERL_GLUE: $(MOD)
cd $(PERLGLUE)
$(PERL) Makefile.PL
$(MAKE) /nologo
- cd $(CFG_HOME)
+ cd $(APREQ_HOME)
PERL_TEST: $(MOD)
cd $(PERLGLUE)
@@ -320,4 +326,4 @@
$(PERL) Makefile.PL
!ENDIF
$(MAKE) /nologo test
- cd $(CFG_HOME)
+ cd $(APREQ_HOME)
1.5 +8 -11 httpd-apreq-2/win32/libapreq.mak
Index: libapreq.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/libapreq.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libapreq.mak 19 Jul 2003 22:55:41 -0000 1.4
+++ libapreq.mak 21 Jul 2003 00:46:44 -0000 1.5
@@ -36,12 +36,9 @@
CPP=cl.exe
RSC=rc.exe
-OUTDIR=.\libs
-INTDIR=.\libs
-# Begin Custom Macros
-OutDir=.\libs
-# End Custom Macros
-
+CFG_HOME=$(APREQ_HOME)\win32
+OUTDIR=$(CFG_HOME)\libs
+INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "libapreq - Win32 Release"
@@ -125,31 +122,31 @@
!IF "$(CFG)" == "libapreq - Win32 Release" || "$(CFG)" == "libapreq - Win32
Debug"
-SOURCE=..\src\apreq.c
+SOURCE=$(APREQ_HOME)\src\apreq.c
"$(INTDIR)\apreq.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\src\apreq_cookie.c
+SOURCE=$(APREQ_HOME)\src\apreq_cookie.c
"$(INTDIR)\apreq_cookie.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\src\apreq_params.c
+SOURCE=$(APREQ_HOME)\src\apreq_params.c
"$(INTDIR)\apreq_params.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\src\apreq_parsers.c
+SOURCE=$(APREQ_HOME)\src\apreq_parsers.c
"$(INTDIR)\apreq_parsers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\src\apreq_tables.c
+SOURCE=$(APREQ_HOME)\src\apreq_tables.c
"$(INTDIR)\apreq_tables.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.4 +9 -18 httpd-apreq-2/win32/libapreq_cgi.mak
Index: libapreq_cgi.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/libapreq_cgi.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libapreq_cgi.mak 19 Jul 2003 22:55:41 -0000 1.3
+++ libapreq_cgi.mak 21 Jul 2003 00:46:44 -0000 1.4
@@ -37,25 +37,23 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "libapreq_cgi - Win32 Release"
+CFG_HOME=$(APREQ_HOME)\win32
+OUTDIR=$(CFG_HOME)\libs
+INTDIR=$(CFG_HOME)\libs
-OUTDIR=.\libs
-INTDIR=.\libs
-# Begin Custom Macros
-OutDir=.\libs
-# End Custom Macros
+!IF "$(CFG)" == "libapreq_cgi - Win32 Release"
ALL : "$(OUTDIR)\libapreq_cgi.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 "LIBAPREQ_CGI_EXPORTS" /I"$(APACHE)\include" /I"..\src"
/Fp"$(INTDIR)\libapreq_cgi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "LIBAPREQ_CGI_EXPORTS" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\libapreq_cgi.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq_cgi.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 /def:libapreq_cgi.def /machine:I386
/out:"$(OUTDIR)\libapreq_cgi.so" /implib:"$(OUTDIR)\libapreq_cgi.lib"
+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 /def:$(CFG_HOME)\libapreq_cgi.def
/machine:I386 /out:"$(OUTDIR)\libapreq_cgi.so"
/implib:"$(OUTDIR)\libapreq_cgi.lib"
LINK32_OBJS= \
"$(INTDIR)\libapreq_cgi.obj" \
"$(OUTDIR)\libapreq.lib" \
@@ -69,23 +67,17 @@
!ELSEIF "$(CFG)" == "libapreq_cgi - Win32 Debug"
-OUTDIR=.\libs
-INTDIR=.\libs
-# Begin Custom Macros
-OutDir=.\libs
-# End Custom Macros
-
ALL : "$(OUTDIR)\libapreq_cgi.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 "LIBAPREQ_CGI_EXPORTS"
/I"$(APACHE)\include" /I"..\src" /Fp"$(INTDIR)\libapreq_cgi.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" /D "LIBAPREQ_CGI_EXPORTS"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\libapreq_cgi.pch"
/YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq_cgi.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 /def:libapreq_cgi.def
/pdb:"$(OUTDIR)\libapreq_cgi.pdb" /debug /machine:I386
/out:"$(OUTDIR)\libapreq_cgi.so" /implib:"$(OUTDIR)\libapreq_cgi.lib"
/pdbtype:sept
+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 /def:$(CFG_HOME)\libapreq_cgi.def
/pdb:"$(OUTDIR)\libapreq_cgi.pdb" /debug /machine:I386
/out:"$(OUTDIR)\libapreq_cgi.so" /implib:"$(OUTDIR)\libapreq_cgi.lib"
/pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\libapreq_cgi.obj" \
"$(OUTDIR)\libapreq.lib" \
@@ -131,11 +123,10 @@
!IF "$(CFG)" == "libapreq_cgi - Win32 Release" || "$(CFG)" == "libapreq_cgi
- Win32 Debug"
-SOURCE=..\env\libapreq_cgi.c
+SOURCE=$(APREQ_HOME)\env\libapreq_cgi.c
"$(INTDIR)\libapreq_cgi.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
!ENDIF
1.5 +8 -11 httpd-apreq-2/win32/mod_apreq.mak
Index: mod_apreq.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/mod_apreq.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_apreq.mak 19 Jul 2003 22:55:41 -0000 1.4
+++ mod_apreq.mak 21 Jul 2003 00:46:44 -0000 1.5
@@ -37,11 +37,9 @@
MTL=midl.exe
RSC=rc.exe
-OUTDIR=.\libs
-INTDIR=.\libs
-# Begin Custom Macros
-OutDir=.\libs
-# End Custom Macros
+CFG_HOME=$(APREQ_HOME)\win32
+OUTDIR=$(CFG_HOME)\libs
+INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "mod_apreq - Win32 Release"
@@ -50,12 +48,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" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include" /I"..\src"
/Fp"$(INTDIR)\mod_apreq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+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)\src"
/Fp"$(INTDIR)\mod_apreq.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq.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 /def:mod_apreq.def /machine:I386
/out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib"
+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 /def:$(CFG_HOME)\mod_apreq.def
/machine:I386 /out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_apreq.obj" \
"$(APACHE)\lib\libapr.lib" \
@@ -75,12 +73,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" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include"
/I"..\src" /Fp"$(INTDIR)\mod_apreq.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" /D "MOD_APREQ_EXPORTS" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\src" /Fp"$(INTDIR)\mod_apreq.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_apreq.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 /def:mod_apreq.def
/pdb:"$(OUTDIR)\mod_apreq.pdb" /debug /machine:I386
/out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib" /pdbtype:sept
+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 /def:$(CFG_HOME)\mod_apreq.def
/pdb:"$(OUTDIR)\mod_apreq.pdb" /debug /machine:I386
/out:"$(OUTDIR)\mod_apreq.so" /implib:"$(OUTDIR)\mod_apreq.lib" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\mod_apreq.obj" \
"$(APACHE)\lib\libapr.lib" \
@@ -127,11 +125,10 @@
!IF "$(CFG)" == "mod_apreq - Win32 Release" || "$(CFG)" == "mod_apreq -
Win32 Debug"
-SOURCE=..\env\mod_apreq.c
+SOURCE=$(APREQ_HOME)\env\mod_apreq.c
"$(INTDIR)\mod_apreq.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
!ENDIF
1.6 +12 -16 httpd-apreq-2/win32/testall.mak
Index: testall.mak
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/testall.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testall.mak 17 Jun 2003 04:16:52 -0000 1.5
+++ testall.mak 21 Jul 2003 00:46:44 -0000 1.6
@@ -31,13 +31,11 @@
NULL=
!ELSE
NULL=nul
-!ENDIF
+!ENDIF
-OUTDIR=.\libs
-INTDIR=.\libs
-# Begin Custom Macros
-OutDir=.\libs
-# End Custom Macros
+CFG_HOME=$(APREQ_HOME)\win32
+OUTDIR=$(CFG_HOME)\libs
+INTDIR=$(CFG_HOME)\libs
!IF "$(CFG)" == "testall - Win32 Release"
ALL : "$(OUTDIR)\testall.exe"
@@ -46,7 +44,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"..\src" /Fp"$(INTDIR)\testall.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)\src" /Fp"$(INTDIR)\testall.pch" /YX
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -108,7 +106,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"..\src"
/Fp"$(INTDIR)\testall.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)\src"
/Fp"$(INTDIR)\testall.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -166,42 +164,40 @@
!IF "$(CFG)" == "testall - Win32 Release" || "$(CFG)" == "testall - Win32
Debug"
-SOURCE=..\t\cookie.c
+SOURCE=$(APREQ_HOME)\t\cookie.c
"$(INTDIR)\cookie.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\t\CuTest.c
+SOURCE=$(APREQ_HOME)\t\CuTest.c
"$(INTDIR)\CuTest.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\t\env.c
+SOURCE=$(APREQ_HOME)\t\env.c
"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\t\params.c
+SOURCE=$(APREQ_HOME)\t\params.c
"$(INTDIR)\params.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\t\parsers.c
+SOURCE=$(APREQ_HOME)\t\parsers.c
"$(INTDIR)\parsers.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\t\testall.c
+SOURCE=$(APREQ_HOME)\t\testall.c
"$(INTDIR)\testall.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
!ENDIF
