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 2013/06/28 18:47:21 UTC
svn commit: r1497840 - in /apr/apr-util/branches/0.9.x/xml/expat/lib:
xml.dep xml.mak
Author: wrowe
Date: Fri Jun 28 16:47:21 2013
New Revision: 1497840
URL: http://svn.apache.org/r1497840
Log:
In updating xml, the win32 make mechanism changed a bit. Reexport mak/dep.
Modified:
apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dep
apr/apr-util/branches/0.9.x/xml/expat/lib/xml.mak
Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dep
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dep?rev=1497840&r1=1497839&r2=1497840&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dep (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dep Fri Jun 28 16:47:21 2013
@@ -1,8 +1,8 @@
# Microsoft Developer Studio Generated Dependency File, included by xml.mak
.\xmlparse.c : \
- ".\config.h"\
".\expat.h"\
+ ".\internal.h"\
".\winconfig.h"\
".\xmlrole.h"\
".\xmltok.h"\
@@ -10,7 +10,7 @@
.\xmlrole.c : \
".\ascii.h"\
- ".\config.h"\
+ ".\internal.h"\
".\winconfig.h"\
".\xmlrole.h"\
".\xmltok.h"\
@@ -19,8 +19,8 @@
.\xmltok.c : \
".\ascii.h"\
".\asciitab.h"\
- ".\config.h"\
".\iasciitab.h"\
+ ".\internal.h"\
".\latin1tab.h"\
".\nametab.h"\
".\utf8tab.h"\
@@ -30,16 +30,3 @@
".\xmltok_impl.h"\
".\xmltok_ns.c"\
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-!ENDIF
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-!ENDIF
-
Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/xml.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/xml/expat/lib/xml.mak?rev=1497840&r1=1497839&r2=1497840&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/lib/xml.mak (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/lib/xml.mak Fri Jun 28 16:47:21 2013
@@ -1,20 +1,22 @@
# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp
!IF "$(CFG)" == ""
-CFG=xml - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to xml - Win32 Debug.
+CFG=xml - Win32 Release
+!MESSAGE No configuration specified. Defaulting to xml - Win32 Release.
!ENDIF
-!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug"
+!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug" && "$(CFG)" != "xml - x64 Release" && "$(CFG)" != "xml - x64 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 "xml.mak" CFG="xml - Win32 Debug"
+!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
@@ -37,8 +39,8 @@ ALL : "$(OUTDIR)\xml.lib"
CLEAN :
- -@erase "$(INTDIR)\xml_src.idb"
- -@erase "$(INTDIR)\xml_src.pdb"
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
@@ -48,7 +50,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xml_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -105,24 +107,22 @@ INTDIR=.\LibD
OutDir=.\LibD
# End Custom Macros
-ALL : ".\expat.h" ".\config.h" "$(OUTDIR)\xml.lib"
+ALL : "$(OUTDIR)\xml.lib"
CLEAN :
- -@erase "$(INTDIR)\xml_src.idb"
- -@erase "$(INTDIR)\xml_src.pdb"
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
-@erase "$(OUTDIR)\xml.lib"
- -@erase ".\config.h"
- -@erase ".\expat.h"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xml_src" /FD /EHsc /c
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -171,88 +171,180 @@ LIB32_OBJS= \
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
-!ENDIF
+!ELSEIF "$(CFG)" == "xml - x64 Release"
+OUTDIR=.\x64\LibR
+INTDIR=.\x64\LibR
+# Begin Custom Macros
+OutDir=.\x64\LibR
+# End Custom Macros
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("xml.dep")
-!INCLUDE "xml.dep"
-!ELSE
-!MESSAGE Warning: cannot find "xml.dep"
-!ENDIF
-!ENDIF
+ALL : "$(OUTDIR)\xml.lib"
-!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug"
-SOURCE=.\xmlparse.c
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
-"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\expat.h" ".\config.h"
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c
-SOURCE=.\xmlrole.c
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\config.h"
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-SOURCE=.\xmltok.c
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\config.h"
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-SOURCE=xmltok_impl.c
-SOURCE=xmltok_ns.c
-SOURCE=.\expat.h.in
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
-!IF "$(CFG)" == "xml - Win32 Release"
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
-InputPath=.\expat.h.in
+!ELSEIF "$(CFG)" == "xml - x64 Debug"
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- type .\expat.h.in > .\expat.h
-<<
-
+OUTDIR=.\x64\LibD
+INTDIR=.\x64\LibD
+# Begin Custom Macros
+OutDir=.\x64\LibD
+# End Custom Macros
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+ALL : "$(OUTDIR)\xml.lib"
-InputPath=.\expat.h.in
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- type .\expat.h.in > .\expat.h
-<<
-
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
-!ENDIF
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-SOURCE=.\winconfig.h
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
-!IF "$(CFG)" == "xml - Win32 Release"
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-InputPath=.\winconfig.h
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- type .\winconfig.h > .\config.h
-<<
-
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-InputPath=.\winconfig.h
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- type .\winconfig.h > .\config.h
-<<
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
+
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("xml.dep")
+!INCLUDE "xml.dep"
+!ELSE
+!MESSAGE Warning: cannot find "xml.dep"
+!ENDIF
!ENDIF
+!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug"
+SOURCE=.\xmlparse.c
+
+"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\xmlrole.c
+
+"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\xmltok.c
+
+"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=xmltok_impl.c
+SOURCE=xmltok_ns.c
+
!ENDIF