Author: randyk
Date: Tue Feb 15 21:43:55 2005
New Revision: 154000

URL: http://svn.apache.org/viewcvs?view=rev&rev=154000
Log:
Further work on changing the Win32 makefiles to recognize
the new directory structure.

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/libapreq2.mak
    httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.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=153999&r2=154000
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/Configure.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/Configure.pl Tue Feb 15 
21:43:55 2005
@@ -85,8 +85,6 @@
         $(PERL) "-MExtUtils::Command::MM" "-e" "test_harness()" $(TEST_FILES)
        cd $(APREQ_HOME)
        $(MAKE) /nologo /f $(CFG_HOME)\$(CGITEST).mak CFG="$(CGITEST) - Win32 
$(CFG)" APACHE="$(APACHE)" APREQ_HOME="$(APREQ_HOME)" APR_LIB="$(APR_LIB)" 
APU_LIB="$(APU_LIB)"
-        if not exist "$(APREQ_ENV)\t\cgi-bin" mkdir "$(APREQ_ENV)\t\cgi-bin"
-        copy $(LIBDIR)\test_cgi.exe $(APREQ_ENV)\t\cgi-bin\test_cgi.exe
         cd $(APREQ_HOME)
 END
 
@@ -96,8 +94,6 @@
         $(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj
         cd $(TDIR)
         $(RM_F) *.pch *.exe *.exp *.lib *.pdb *.ilk *.idb *.so *.dll *.obj
-        cd $(APREQ_ENV)
-        $(PERL) t\TEST.PL -clean
         cd $(APREQ_HOME)
 !IF EXIST("$(PERLGLUE)\Makefile")
         cd $(PERLGLUE)
@@ -445,7 +441,6 @@
 LIBDIR=$(CFG_HOME)\libs
 PERLGLUE=$(APREQ_HOME)\glue\perl
 APACHE_LIB=$(APACHE)\lib
-APREQ_ENV=$(APREQ_HOME)\env
 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=153999&r2=154000
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/apreq2_test.mak Tue Feb 15 
21:43:55 2005
@@ -69,7 +69,7 @@
 "$(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)\include" 
/YX /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" 
/I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /YX /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(LIBDIR)\apreq2_test.bsc"      
 LIB32=link.exe -lib
@@ -127,7 +127,7 @@
 "$(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"$(LIBDIR)\apreq2_test.pch" /YX /I"$(APACHE)\include" 
/I"$(APREQ_HOME)\include" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /GZ  /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D 
"_LIB"/YX /I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /FD /GZ  /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(LIBDIR)\apreq2_test.bsc" 
 LIB32=link.exe -lib
@@ -194,42 +194,32 @@
    $(CPP_PROJ) $< 
 <<
 
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apreq2_test.dep")
-!INCLUDE "apreq2_test.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apreq2_test.dep"
-!ENDIF 
-!ENDIF 
-
-
 !IF "$(CFG)" == "apreq2_test - Win32 Release" || "$(CFG)" == "apreq2_test - 
Win32 Debug"
 
 SOURCE=$(LIBTDIR)\at.c
 
 "$(LIBDIR)\at.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(LIBDIR)\at.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBTDIR)\cookie.c
 
 "$(OUTDIR)\cookie.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(OUTDIR)\cookie.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBTDIR)\params.c
 
 "$(OUTDIR)\params.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(OUTDIR)\params.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBTDIR)\parsers.c
 
 "$(OUTDIR)\parsers.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(OUTDIR)\parsers.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBTDIR)\version.c
 
 "$(OUTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(OUTDIR)\version.obj" $(CPP_PROJ) $(SOURCE)
 
 !ENDIF 
 

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=153999&r2=154000
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/libapreq2.mak Tue Feb 15 
21:43:55 2005
@@ -77,7 +77,7 @@
 "$(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)\include" 
/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" /YX /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
@@ -96,7 +96,7 @@
 "$(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)\include" 
/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" /YX /FD 
/GZ  /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
@@ -146,57 +146,57 @@
 SOURCE=$(LIBDIR)\cookie.c
 
 "$(INTDIR)\cookie.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\cookie.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\param.c
 
 "$(INTDIR)\param.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\param.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\parser.c
 
 "$(INTDIR)\parser.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\parser.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\parser_header.c
 
 "$(INTDIR)\parser_header.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\parser_header.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\parser_multipart.c
 
 "$(INTDIR)\parser_multipart.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\parser_multipart.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\parser_urlencoded.c
 
 "$(INTDIR)\parser_urlencoded.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\parser_urlencoded.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\version.c
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\version.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\module.c
 
 "$(INTDIR)\module.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\module.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\module_custom.c
 
 "$(INTDIR)\module_custom.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\module_custom.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\module_cgi.c
 
 "$(INTDIR)\module_cgi.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\module_cgi.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(LIBDIR)\util.c
 
 "$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\util.obj" $(CPP_PROJ) $(SOURCE)
 
 !ENDIF 
 

Modified: 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=diff&r1=153999&r2=154000
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/mod_apreq2.mak Tue Feb 15 
21:43:55 2005
@@ -72,7 +72,7 @@
 "$(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 
+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)" /YX /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc" 
@@ -90,7 +90,7 @@
 "$(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 
+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)" /YX /FD /GZ  /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_apreq2.bsc" 
@@ -139,12 +139,12 @@
 SOURCE=$(MODDIR)\filter.c
 
 "$(INTDIR)\filter.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\filter.obj" $(CPP_PROJ) $(SOURCE)
 
 SOURCE=$(MODDIR)\handle.c
 
 "$(INTDIR)\handle.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\handle.obj" $(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=153999&r2=154000
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak (original)
+++ httpd/apreq/branches/multi-env-unstable/win32/test_cgi.mak Tue Feb 15 
21:43:55 2005
@@ -48,9 +48,16 @@
 !ENDIF
 
 CFG_HOME=$(APREQ_HOME)\win32
+MODULE=$(CFG_HOME)\module
 OUTDIR=$(CFG_HOME)\libs
 INTDIR=$(CFG_HOME)\libs
 
+LINK32_OBJS= \
+        "$(INTDIR)\test_cgi.obj" \
+       "$(OUTDIR)\libapreq2.lib" \
+       "$(APR_LIB)" \
+       "$(APU_LIB)"
+
 !IF  "$(CFG)" == "test_cgi - Win32 Release"
 ALL : "$(OUTDIR)\test_cgi.exe"
 
@@ -58,53 +65,13 @@
     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)\include" /Fp"$(INTDIR)\test_cgi.pch" /YX 
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.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) $< 
-<<
+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 
/FD /c 
 
 RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\test_cgi.bsc" 
 LINK32=link.exe
-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:no 
/pdb:"$(OUTDIR)\test_cgi.pdb" /machine:I386 /out:"$(OUTDIR)\test_cgi.exe" 
-LINK32_OBJS= \
-        "$(INTDIR)\test_cgi.obj" \
-       "$(OUTDIR)\libapreq2.lib" \
-       "$(APR_LIB)" \
-       "$(APU_LIB)"
-
-"$(OUTDIR)\test_cgi.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
+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:no 
/pdb:"$(OUTDIR)\test_cgi.pdb" /machine:I386 
/out:"$(MODULE)\t\cgi-bin\test_cgi.exe" 
 
 !ELSEIF  "$(CFG)" == "test_cgi - Win32 Debug"
 
@@ -114,7 +81,17 @@
     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)\include" 
/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" /YX /FD /GZ /c 
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\test_cgi.bsc" 
+LINK32=link.exe
+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 
/pdb:"$(OUTDIR)\test_cgi.pdb" /debug /machine:I386 
/out:"$(MODULE)\t\cgi-bin\test_cgi.exe" /pdbtype:sept 
+
+!ENDIF 
+
+!IF "$(CFG)" == "test_cgi - Win32 Release" || "$(CFG)" == "test_cgi - Win32 
Debug"
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -146,31 +123,15 @@
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\test_cgi.bsc" 
-LINK32=link.exe
-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 
/pdb:"$(OUTDIR)\test_cgi.pdb" /debug /machine:I386 
/out:"$(OUTDIR)\test_cgi.exe" /pdbtype:sept 
-LINK32_OBJS= \
-        "$(INTDIR)\test_cgi.obj" \
-       "$(OUTDIR)\libapreq2.lib" \
-       "$(APR_LIB)" \
-       "$(APU_LIB)"
-
 "$(OUTDIR)\test_cgi.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-!ENDIF 
-
-
-!IF "$(CFG)" == "test_cgi - Win32 Release" || "$(CFG)" == "test_cgi - Win32 
Debug"
-
-SOURCE=$(APREQ_HOME)\module\test_cgi.c
+SOURCE=$(MODULE)\test_cgi.c
 
 "$(INTDIR)\test_cgi.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) /Fo"$(INTDIR)\test_cgi.obj" $(CPP_PROJ) $(SOURCE)
 
 !ENDIF 
 


Reply via email to