3 files changed, 12 insertions, 11 deletions
diff --git a/xsd/tests/cxx/tree/encoding/char/lcp/driver.cxx b/xsd/tests/cxx/tree/encoding/char/lcp/driver.cxx
index 2fb13a3..d44d0fe 100644
--- a/xsd/tests/cxx/tree/encoding/char/lcp/driver.cxx
+++ b/xsd/tests/cxx/tree/encoding/char/lcp/driver.cxx
@@ -1,13 +1,12 @@
 // file      : tests/cxx/tree/encoding/char/lcp/driver.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 // Test local code page encoding (--char-encoding lcp).
 // The test just makes sure it still compiles and works.
 //
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::auto_ptr/unique_ptr
 #include <fstream>
 #include <iostream>
 
@@ -27,7 +26,7 @@ main (int argc, char* argv[])
 
   try
   {
-    auto_ptr<type> r (root (argv[1]));
+    XSD_AUTO_PTR<type> r (root (argv[1]));
 
     xml_schema::namespace_infomap map;
     map["t"].name = "test";
diff --git a/xsd/tests/cxx/tree/encoding/char/lcp/makefile b/xsd/tests/cxx/tree/encoding/char/lcp/makefile
index 518c514..9dc599d 100644
--- a/xsd/tests/cxx/tree/encoding/char/lcp/makefile
+++ b/xsd/tests/cxx/tree/encoding/char/lcp/makefile
@@ -1,6 +1,5 @@
 # file      : tests/cxx/tree/encoding/char/lcp/makefile
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 # license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
@@ -27,17 +26,17 @@ $(call import,\
 #
 $(driver): $(obj) $(xerces_c.l)
 
-$(obj) $(dep): cpp_options := -I$(src_root)/libxsd
+$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
 $(obj) $(dep): $(xerces_c.l.cpp-options)
 
 genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options := --generate-serialization --char-encoding lcp
+$(gen): xsd_options += --generate-serialization --char-encoding lcp
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -74,7 +73,12 @@ endif
 $(call include,$(bld_root)/cxx/o-e.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/cxx-d.make)
+
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): xsd_options += --std $(cxx_standard)
 $(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
+endif
 
 
 # Dependencies.
diff --git a/xsd/tests/cxx/tree/encoding/char/lcp/test.std b/xsd/tests/cxx/tree/encoding/char/lcp/test.std
index cc20ef7..368826d 100644
--- a/xsd/tests/cxx/tree/encoding/char/lcp/test.std
+++ b/xsd/tests/cxx/tree/encoding/char/lcp/test.std
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <t:root xmlns:t="test">
-
   <a>abcd</a>
-
 </t:root>