3 files changed, 39 insertions, 31 deletions
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index f33852729..2aca50020 100644
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -35,11 +35,13 @@ XMLTOHB_HEADER_TARGETS = \
     attributetraits.H    \
     attributestructs.H   \
     pnortargeting.H      \
-    fapiplatattrmacros.H
+    fapiplatattrmacros.H \
+    errludattribute.H
 
 XMLTOHB_SOURCE_TARGETS = \
     attributestrings.C   \
-    attributedump.C
+    attributedump.C      \
+    errludattribute.C
 
 XMLTOHB_SYSTEM_BINARIES =       \
    vbu_targeting.bin            \
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index 98392becc..b6e6e0fad 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -1,26 +1,26 @@
 #!/usr/bin/perl
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# $Source: src/usr/targeting/common/xmltohb/xmltohb.pl $ 
-#  
-# IBM CONFIDENTIAL 
-#  
-# COPYRIGHT International Business Machines Corp. 2011,2012 
-#  
-# p1 
-#  
-# Object Code Only (OCO) source materials 
-# Licensed Internal Code Source Materials 
-# IBM HostBoot Licensed Internal Code 
-#  
-# The source code for this program is not published or otherwise 
-# divested of its trade secrets, irrespective of what has been 
-# deposited with the U.S. Copyright Office. 
-#  
-# Origin: 30 
-#  
-# IBM_PROLOG_END_TAG 
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/targeting/common/xmltohb/xmltohb.pl $
+#
+# IBM CONFIDENTIAL
+#
+# COPYRIGHT International Business Machines Corp. 2011,2013
+#
+# p1
+#
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# Origin: 30
+#
+# IBM_PROLOG_END_TAG
 
 #
 # Purpose:
@@ -1507,6 +1507,7 @@ sub writeAttrErrlCFile {
     print $outFile "#include <stdio.h>\n";
     print $outFile "#include <string.h>\n";
     print $outFile "#include <errludattribute.H>\n";
+    print $outFile "#include <errl/errlreasoncodes.H>\n";
     print $outFile "#include <targeting/common/targetservice.H>\n";
     print $outFile "#include <targeting/common/trace.H>\n";
     print $outFile "\n";
@@ -1684,9 +1685,9 @@ sub writeAttrErrlCFile {
     print $outFile "    : iv_pTarget(i_pTarget), iv_dataSize(0)\n";
     print $outFile "{\n";
     print $outFile "    // Set up ErrlUserDetails instance variables\n";
-    print $outFile "    iv_CompId = HBERRL_COMP_ID;\n";
+    print $outFile "    iv_CompId = ERRL_COMP_ID;\n";
     print $outFile "    iv_Version = 1;\n";
-    print $outFile "    iv_SubSection = HBERRL_UDT_ATTRIBUTE;\n";
+    print $outFile "    iv_SubSection = ERRL_UDT_ATTRIBUTE;\n";
     print $outFile "    iv_merge = true;\n";
     print $outFile "\n";
     print $outFile "    // first, write out the HUID\n";
@@ -1704,9 +1705,9 @@ sub writeAttrErrlCFile {
     print $outFile "    : iv_pTarget(i_pTarget), iv_dataSize(0)\n";
     print $outFile "{\n";
     print $outFile "    // Set up ErrlUserDetails instance variables\n";
-    print $outFile "    iv_CompId = HBERRL_COMP_ID;\n";
+    print $outFile "    iv_CompId = ERRL_COMP_ID;\n";
     print $outFile "    iv_Version = 1;\n";
-    print $outFile "    iv_SubSection = HBERRL_UDT_ATTRIBUTE;\n";
+    print $outFile "    iv_SubSection = ERRL_UDT_ATTRIBUTE;\n";
     print $outFile "    // override the default of false\n";
     print $outFile "    iv_merge = true;\n";
     print $outFile "\n";
@@ -1759,10 +1760,10 @@ sub writeAttrErrlHFile {
     print $outFile "#ifndef ERRL_UDATTRIBUTE_H\n";
     print $outFile "#define ERRL_UDATTRIBUTE_H\n";
     print $outFile "\n";
-    print $outFile "#include <errl/errluserdetails.H>\n";
-    print $outFile "\n";
     print $outFile "#ifndef PARSER\n";
     print $outFile "\n";
+    print $outFile "#include <errl/errluserdetails.H>\n";
+    print $outFile "\n";
     print $outFile "namespace TARGETING // Forward reference\n";
     print $outFile "{ class Target; }\n";
     print $outFile "\n";
@@ -1791,6 +1792,8 @@ sub writeAttrErrlHFile {
     print $outFile "}\n";
     print $outFile "#else // if PARSER defined\n";
     print $outFile "\n";
+    print $outFile "#include \"errluserdetails.H\"\n";
+    print $outFile "\n";
     print $outFile "namespace ERRORLOG\n";
     print $outFile "{\n";
     print $outFile "class ErrlUserDetailsParserAttribute : public ErrlUserDetailsParser {\n";
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index 2cc853475..bd6c29a45 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2012
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
 # p1
 #
@@ -73,6 +73,8 @@ VMM_CONSTS_FILE = \
 
 GENFILES = ${XMLTOHB_TARGETS}
 
+GENFILES_PLUGINS = errludattribute.H
+
 #debug :
 #	@echo COMMON_TARGETING_PATH_PREFIX = ${COMMON_TARGETING_PATH_PREFIX}
 #	@echo COMMON_TARGETING_REL_PATH = ${COMMON_TARGETING_REL_PATH}
@@ -131,6 +133,7 @@ $(call GENTARGET,$(XMLTOHB_TARGETS)) : \
        $(addprefix --fapi-attributes-xml-file=,${GENDIR}/${XMLTOHB_FAPI_XML}) \
          --src-output-dir=$(dir $@) --img-output-dir=none \
          --img-output-file=none
+	cp ${GENDIR}/errludattribute.H ${GENDIR_PLUGINS}
 
 # system-specific XML needs the generic plus the xxx.system.xml file + the
 # MRW file