You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/03/08 06:37:36 UTC
cvs commit: apr-util aprutil.mak libaprutil.mak
wrowe 01/03/07 21:37:35
Modified: . aprutil.mak libaprutil.mak
Log:
Forgot to use the fixwin32mak.pl magic
Revision Changes Path
1.7 +8 -8 apr-util/aprutil.mak
Index: aprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/aprutil.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aprutil.mak 2001/03/08 05:28:44 1.6
+++ aprutil.mak 2001/03/08 05:37:35 1.7
@@ -782,12 +782,12 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
"expat - Win32 Release" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Release"
cd "..\apr-util"
"expat - Win32 ReleaseCLEAN" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -795,12 +795,12 @@
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
"expat - Win32 Debug" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Debug"
cd "..\apr-util"
"expat - Win32 DebugCLEAN" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
@@ -810,12 +810,12 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
"apr - Win32 Release" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\apr-util"
"apr - Win32 ReleaseCLEAN" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -823,12 +823,12 @@
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
"apr - Win32 Debug" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\apr-util"
"apr - Win32 DebugCLEAN" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\apr-util"
1.6 +8 -8 apr-util/libaprutil.mak
Index: libaprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libaprutil.mak 2001/03/08 05:28:44 1.5
+++ libaprutil.mak 2001/03/08 05:37:35 1.6
@@ -804,12 +804,12 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
"libapr - Win32 Release" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
cd "..\apr-util"
"libapr - Win32 ReleaseCLEAN" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -817,12 +817,12 @@
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
"libapr - Win32 Debug" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
cd "..\apr-util"
"libapr - Win32 DebugCLEAN" :
- cd "\clean\httpd-2.0\srclib\apr"
+ cd "..\..\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
@@ -832,12 +832,12 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
"libexpat - Win32 Release" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release"
cd "..\apr-util"
"libexpat - Win32 ReleaseCLEAN" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
CFG="libexpat - Win32 Release" RECURSE=1
cd "..\apr-util"
@@ -845,12 +845,12 @@
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
"libexpat - Win32 Debug" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"
cd "..\apr-util"
"libexpat - Win32 DebugCLEAN" :
- cd "\clean\httpd-2.0\srclib\expat-lite"
+ cd "..\..\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
Re: cvs commit: apr-util aprutil.mak libaprutil.mak
Posted by "William A. Rowe, Jr." <ad...@rowe-clan.net>.
> wrowe 01/03/07 21:37:35
>
> Modified: . aprutil.mak libaprutil.mak
> Log:
> Forgot to use the fixwin32mak.pl magic
>
> Revision Changes Path
> 1.7 +8 -8 apr-util/aprutil.mak
>
> @@ -810,12 +810,12 @@
> !IF "$(CFG)" == "aprutil - Win32 Release"
>
> "apr - Win32 Release" :
> - cd "\clean\httpd-2.0\srclib\apr"
> + cd "..\..\srclib\apr"
> $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
> cd "..\apr-util"
>
> "apr - Win32 ReleaseCLEAN" :
> - cd "\clean\httpd-2.0\srclib\apr"
> + cd "..\..\srclib\apr"
> $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
> RECURSE=1
> cd "..\apr-util"
This bit won't be going away. I'm wondering, if someone wants to hack the magic
httpd-2.0\build\fixwin32mak.pl, I'd imagine there has to be a simple one line way
to make the inner ..\srclib\ simply disappear, since both are in the srclib\ tree.
Of course, it's easier just to run that from apr-util\build (it isn't duplicated
over there right now, but could/should be) I'm just thinking that an apr-util/apr
user isn't necessarily building from httpd-2.0/srclib.
Bill