PRD: refactored prd_ruletable.mk

Change-Id: I5234a2a9f75be61ec0b1be7a16d9244493360000
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14332
Tested-by: Jenkins Server
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Squashed: I724651c51c44285d476bf76d71ff4e1efbd98fa9
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14496

3 files changed, 24 insertions, 18 deletions

diff --git a/src/usr/diag/prdf/common/prd_ruletable.mk b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
index 1ebdd8d52..1f58070ea 100755..100644
--- a/src/usr/diag/prdf/common/prd_ruletable.mk
+++ b/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
@@ -1,11 +1,13 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/prdf/common/prd_ruletable.mk $
+# $Source: src/usr/diag/prdf/common/framework/rule/prdf_rule.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2005,2014
+# Contributors Listed Below - COPYRIGHT 2014
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,19 +23,14 @@
 #
 # IBM_PROLOG_END_TAG
 
-PRDR_RULE_TABLE_FILES += Proc.rule
-PRDR_RULE_TABLE_FILES += Ex.rule
-PRDR_RULE_TABLE_FILES += Mcs.rule
-PRDR_RULE_TABLE_FILES += Membuf.rule
-PRDR_RULE_TABLE_FILES += Mba.rule
-
-PRDR_RULE_TABLE_TARGETS = ${PRDR_RULE_TABLE_FILES:.rule=.prf}
+prd_rule_files += Proc.rule
+prd_rule_files += Ex.rule
+prd_rule_files += Mcs.rule
+prd_rule_files += Membuf.rule
+prd_rule_files += Mba.rule
 
-prd_ruletable += prdrLoadChip.o
-prd_ruletable += prdrLoadChipCache.o
-prd_ruletable += prdfRuleMetaData.o
-prd_ruletable += prdfRuleChip.o
-prd_ruletable += prdfGroup.o
-prd_ruletable += prdfPluginMap.o
-prd_ruletable += prdfRuleFiles.o
+prd_rule_prf_targets  = ${prd_rule_files:.rule=.prf}
+prd_rule_err_targets  = ${prd_rule_files:.rule=.prf.err.C}
+prd_rule_reg_targets  = ${prd_rule_files:.rule=.prf.reg.C}
+prd_rule_html_targets = ${prd_rule_files:.rule=.prf.html}
 
diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk
index bcc26b395..65405e5e4 100755
--- a/src/usr/diag/prdf/common/framework/rule/tables.mk
+++ b/src/usr/diag/prdf/common/framework/rule/tables.mk
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2005,2014
+# Contributors Listed Below - COPYRIGHT 2012,2014
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +29,7 @@
 #-------------------------------------------------------------------
 
 # Add Rule tables here:
-# FIXME: This is now a duplicate of PRDR_RULE_TABLE_TARGETS in prd_ruletable.mk
+# FIXME: This is now a duplicate of prd_rule_prf_targets in prdf_rule.mk
 PRDR_RULE_TABLES += Proc.prf
 PRDR_RULE_TABLES += Ex.prf
 PRDR_RULE_TABLES += Mcs.prf
diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
index e4d83e0dc..fe227d668 100644
--- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
+++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
@@ -67,6 +67,13 @@ prd_obj += xspprdGardResolution.o
 
 # common/framework/rule/
 prd_obj += iipTemplates.o
+prd_obj += prdfGroup.o
+prd_obj += prdfPluginMap.o
+prd_obj += prdfRuleChip.o
+prd_obj += prdfRuleFiles.o
+prd_obj += prdfRuleMetaData.o
+prd_obj += prdrLoadChip.o
+prd_obj += prdrLoadChipCache.o
 
 # common/framework/service/
 prd_obj_no_sim += prdfPlatServices_common.o