2 files changed, 9 insertions, 35 deletions
diff --git a/xsd/dist/examples/build/cxx/compilers.make b/xsd/dist/examples/build/cxx/compilers.make
index b8d5538..a7f6296 100644
--- a/xsd/dist/examples/build/cxx/compilers.make
+++ b/xsd/dist/examples/build/cxx/compilers.make
@@ -1,6 +1,5 @@
 # file      : examples/build/cxx/compilers.make
-# 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
 
 CXX := g++
@@ -43,13 +42,13 @@ endif
 # Clang
 #
 ifeq ($(cxx_id),)
-ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* clang .*$$//'),)
+ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.*clang.*$$//'),)
 cxx_id := clang
 endif
 endif
 
 ifeq ($(cxx_id),)
-ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.* Clang .*$$//'),)
+ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^.*Clang.*$$//'),)
 cxx_id := clang
 endif
 endif
@@ -65,27 +64,15 @@ endif
 
 # HP C++ (aCC)
 #
-# aCC3 and aCC6 are two very different compilers so we will call them
-# hp3 and hp6.
-#
-
-# 3
-ifeq ($(cxx_id),)
-ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP ANSI C.. .* A\.03\..*$$//'),)
-cxx_id := hp3
-endif
-endif
-
-# 6
 ifeq ($(cxx_id),)
 ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP aC..\/ANSI C .* A\.06\..*$$//'),)
-cxx_id := hp6
+cxx_id := hp
 endif
 endif
 
 ifeq ($(cxx_id),)
 ifeq ($(shell echo '$(cxx_sign)' | sed -e 's/^[^ ]* HP C\/aC.. .* A\.06\..*$$//'),)
-cxx_id := hp6
+cxx_id := hp
 endif
 endif
 
diff --git a/xsd/dist/examples/build/cxx/rules.make b/xsd/dist/examples/build/cxx/rules.make
index 3e74764..3f6c38c 100644
--- a/xsd/dist/examples/build/cxx/rules.make
+++ b/xsd/dist/examples/build/cxx/rules.make
@@ -1,6 +1,5 @@
 # file      : examples/build/cxx/rules.make
-# 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 $(root)/build/cxx/compilers.make
@@ -32,23 +31,11 @@ ifeq ($(cxx_id),sun)
 endif
 
 
-# HP aCC3
+# HP aCC
 #
-ifeq ($(cxx_id),hp3)
+ifeq ($(cxx_id),hp)
 
-  # By default Xerces-C++ is built with -mt for aCC3.
-  # 849 : symbol to long, truncated to 4000
-  # 1039: incompatible vtable layout
-  #
-  CXXFLAGS := -AA -O -mt +W849 +W1039
-endif
-
-
-# HP aCC6
-#
-ifeq ($(cxx_id),hp6)
-
-  # By default Xerces-C++ is built with -mt for aCC6.
+  # By default Xerces-C++ is built with -mt for aCC.
   # 2334 no suitable copy constructor (e.g., for std::auto_ptr)
   #
   CXXFLAGS := -Aa -O -mt +W2334