From 17ff235c817048797c9e8d14c7215a6ad67de29d Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Thu, 29 Mar 2012 10:59:54 +0400
Subject: [PATCH] Use codegen.out.xml instead of static.inc in cmake code
 generation rules.

Now only that file is guaranteed to always be overwritten.
---
 library/CMakeLists.txt | 4 ++--
 library/xml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4d6767b31..9de419b9f 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -189,14 +189,14 @@ FILE(GLOB GENERATE_INPUT_SCRIPTS ${dfapi_SOURCE_DIR}/xml/*.pm ${dfapi_SOURCE_DIR
 FILE(GLOB GENERATE_INPUT_XMLS ${dfapi_SOURCE_DIR}/xml/*.xml)
 
 ADD_CUSTOM_COMMAND(
-    OUTPUT ${dfapi_SOURCE_DIR}/include/df/static.inc
+    OUTPUT ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml
     COMMAND ${PERL_EXECUTABLE} xml/codegen.pl xml include/df
     WORKING_DIRECTORY ${dfapi_SOURCE_DIR}
     MAIN_DEPENDENCY ${dfapi_SOURCE_DIR}/xml/codegen.pl
     DEPENDS ${GENERATE_INPUT_XMLS} ${GENERATE_INPUT_SCRIPTS}
 )
 
-ADD_CUSTOM_TARGET(generate_headers DEPENDS ${dfapi_SOURCE_DIR}/include/df/static.inc)
+ADD_CUSTOM_TARGET(generate_headers DEPENDS ${dfapi_SOURCE_DIR}/include/df/codegen.out.xml)
 
 IF(UNIX)
   # Don't produce debug info for generated stubs
diff --git a/library/xml b/library/xml
index 6d11abbba..3e1c72864 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 6d11abbbae7e5408e739563266f3300261a5c726
+Subproject commit 3e1c728640d8f5a9501908064a2d5385a156058c