5 files changed, 110 insertions, 124 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/tables.mk b/src/usr/diag/prdf/common/framework/rule/tables.mk
index 738631c72..323bdcbc5 100755
--- a/src/usr/diag/prdf/common/framework/rule/tables.mk
+++ b/src/usr/diag/prdf/common/framework/rule/tables.mk
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2005,2013
+# COPYRIGHT International Business Machines Corp. 2005,2014
 #
 # p1
 #
@@ -28,12 +28,11 @@
 
 # Add Rule tables here:
 # FIXME: This is now a duplicate of PRDR_RULE_TABLE_TARGETS in prd_ruletable.mk
-PRDR_RULE_TABLES = \
-	Proc.prf \
-	Ex.prf \
-	Mcs.prf \
-	Membuf.prf \
-	Mba.prf
+PRDR_RULE_TABLES += Proc.prf
+PRDR_RULE_TABLES += Ex.prf
+PRDR_RULE_TABLES += Mcs.prf
+PRDR_RULE_TABLES += Membuf.prf
+PRDR_RULE_TABLES += Mba.prf
 
 #------------------------------------------------------------------
 # Change nothing below this line unless you know what you're doing!
diff --git a/src/usr/diag/prdf/common/plugins/plugins.mk b/src/usr/diag/prdf/common/plugins/plugins.mk
index 28d91752a..27e7efddb 100644
--- a/src/usr/diag/prdf/common/plugins/plugins.mk
+++ b/src/usr/diag/prdf/common/plugins/plugins.mk
@@ -29,12 +29,11 @@ PLUGIN_NAME = lib${BASE_LIB_NAME}
 RULE_LIBRARY_NAME = ${BASE_LIB_NAME}-rule
 PRDR_ERRL_LIB = lib${RULE_LIBRARY_NAME}
 
-LIBRARY_OFILES += \
-    prdfLogParse.o \
-    prdfLogParse_common.o \
-    prdfCenLogParse.o \
-    prdrErrlPluginsSupt.o \
-    prdfParserUtils.o
+LIBRARY_OFILES += prdfLogParse.o
+LIBRARY_OFILES += prdfLogParse_common.o
+LIBRARY_OFILES += prdfCenLogParse.o
+LIBRARY_OFILES += prdrErrlPluginsSupt.o
+LIBRARY_OFILES += prdfParserUtils.o
 
 LIBFLAGS = -Efips/lib
 
diff --git a/src/usr/diag/prdf/common/prd_framework.mk b/src/usr/diag/prdf/common/prd_framework.mk
index 005016ec6..0a5010e09 100755
--- a/src/usr/diag/prdf/common/prd_framework.mk
+++ b/src/usr/diag/prdf/common/prd_framework.mk
@@ -25,78 +25,71 @@
 # PRD object files (common Hostboot and FSP).
 ################################################################################
 
-prd_framework = \
- iipTemplates.o \
- prdfTrace.o \
- prdfMain_common.o prdfMain.o
+prd_framework += iipTemplates.o
+prd_framework += prdfTrace.o
+prd_framework += prdfMain_common.o
+prd_framework += prdfMain.o
 
-prd_util = \
- prdfBitString.o \
- prdfBitKey.o \
- iipdgtb.o \
- iipdigit.o \
- prdfErrlSmartPtr.o \
- prdfFilters.o \
- prdfAssert.o
+prd_util += prdfBitString.o
+prd_util += prdfBitKey.o
+prd_util += iipdgtb.o
+prd_util += iipdigit.o
+prd_util += prdfErrlSmartPtr.o
+prd_util += prdfFilters.o
+prd_util += prdfAssert.o
 
-prd_config = \
- iipchip.o \
- iipConfigurator.o \
- iipDomain.o \
- iipDomainContainer.o \
- prdfFabricDomain.o \
- prdfParentDomain.o \
- prdfRuleChipDomain.o \
- prdfPllDomain.o \
- iipSystem.o \
- prdfExtensibleDomain.o \
+prd_config += iipchip.o
+prd_config += iipConfigurator.o
+prd_config += iipDomain.o
+prd_config += iipDomainContainer.o
+prd_config += prdfFabricDomain.o
+prd_config += prdfParentDomain.o
+prd_config += prdfRuleChipDomain.o
+prd_config += prdfPllDomain.o
+prd_config += iipSystem.o
+prd_config += prdfExtensibleDomain.o
 
-prd_service = \
- prdfServiceDataCollector.o \
- prdfRasServices_common.o \
- prdfTargetServices.o \
- xspprdsdbug.o
+prd_service += prdfServiceDataCollector.o
+prd_service += prdfRasServices_common.o
+prd_service += prdfTargetServices.o
+prd_service += xspprdsdbug.o
 
-prd_resolution = \
- iipResolution.o \
- iipResolutionFactory.o \
- prdfResolutionMap.o \
- prdfThresholdResolutions.o \
- xspprdFlagResolution.o \
- xspprdGardResolution.o \
- prdfClockResolution.o \
- prdfCaptureResolution.o \
- prdfDumpResolution.o
+prd_resolution += iipResolution.o
+prd_resolution += iipResolutionFactory.o
+prd_resolution += prdfResolutionMap.o
+prd_resolution += prdfThresholdResolutions.o
+prd_resolution += xspprdFlagResolution.o
+prd_resolution += xspprdGardResolution.o
+prd_resolution += prdfClockResolution.o
+prd_resolution += prdfCaptureResolution.o
+prd_resolution += prdfDumpResolution.o
 
-prd_register = \
- iipscr.o \
- prdfErrorRegister.o \
- prdfErrorRegisterMask.o \
- prdfRegisterCache.o \
- prdfResetErrorRegister.o \
- prdfScomRegister.o \
- prdfScomRegisterAccess.o \
- prdfCaptureData.o \
- prdfScanFacility.o
+prd_register += iipscr.o
+prd_register += prdfErrorRegister.o
+prd_register += prdfErrorRegisterMask.o
+prd_register += prdfRegisterCache.o
+prd_register += prdfResetErrorRegister.o
+prd_register += prdfScomRegister.o
+prd_register += prdfScomRegisterAccess.o
+prd_register += prdfCaptureData.o
+prd_register += prdfScanFacility.o
 
-prd_mnfgtools = \
- prdfMfgThresholdFile_common.o \
- prdfMfgThresholdMgr.o
+prd_mnfgtools +=  prdfMfgThresholdFile_common.o
+prd_mnfgtools += prdfMfgThresholdMgr.o
 
-prd_object_files = \
- ${prd_framework} \
- ${prd_util} \
- ${prd_config} \
- ${prd_service} \
- ${prd_resolution} \
- ${prd_register} \
- ${prd_mnfgtools} \
+prd_object_files += ${prd_framework}
+prd_object_files += ${prd_util}
+prd_object_files += ${prd_config}
+prd_object_files += ${prd_service}
+prd_object_files += ${prd_resolution}
+prd_object_files += ${prd_register}
+prd_object_files += ${prd_mnfgtools}
 
 ################################################################################
 # PRD object files common to Hostboot and FSP, but not to PRD simulator.
 ################################################################################
 
-prd_object_files_no_sim = \
- prdfHomRegisterAccess.o \
- prdfPlatServices_common.o prdfPlatServices.o
+prd_object_files_no_sim += prdfHomRegisterAccess.o
+prd_object_files_no_sim += prdfPlatServices_common.o
+prd_object_files_no_sim += prdfPlatServices.o
 
diff --git a/src/usr/diag/prdf/common/prd_pegasus.mk b/src/usr/diag/prdf/common/prd_pegasus.mk
index 1d13c05ab..cf7399994 100755
--- a/src/usr/diag/prdf/common/prd_pegasus.mk
+++ b/src/usr/diag/prdf/common/prd_pegasus.mk
@@ -22,41 +22,38 @@
 # IBM_PROLOG_END_TAG
 
 # Object files for prdf rule plugins for pegasus
-PRDF_RULE_PLUGINS_PEGASUS = \
-    prdfP8Proc.o \
-    prdfPlatP8Ex.o \
-    prdfP8Ex.o \
-    prdfP8Mcs.o \
-    prdfP8Pll.o \
-    prdfCenMba.o \
-    prdfPlatCenMba.o \
-    prdfCenMembuf.o \
-    prdfP8TodPlugins.o \
-    prdfCenPll.o \
-    prdfPlatP8Proc.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfP8Proc.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfPlatP8Ex.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfP8Ex.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfP8Mcs.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfP8Pll.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfCenMba.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfPlatCenMba.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfCenMembuf.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfP8TodPlugins.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfCenPll.o
+PRDF_RULE_PLUGINS_PEGASUS += prdfPlatP8Proc.o
 
 # Object files for PRDF rule plugins, but include sim extensions.
-PRDF_RULE_PLUGINS_PEGASUS_WSIM = \
-    prdfP8SystemSpecific.o
+PRDF_RULE_PLUGINS_PEGASUS_WSIM += prdfP8SystemSpecific.o
 
 # PEGASUS specific objects, not rule related.
-prd_pegasus_specific = \
-    prdfCalloutUtil.o \
-    prdfPhbUtils.o \
-    prdfCenAddress.o \
-    prdfCenDqBitmap.o \
-    prdfCenMbaCaptureData.o \
-    prdfCenMbaCeTable.o \
-    prdfCenMbaRceTable.o \
-    prdfCenMbaTdCtlr.o \
-    prdfCenMbaTdCtlr_common.o \
-    prdfCenMbaThresholds_common.o \
-    prdfCenMbaUeTable.o \
-    prdfCenMemUtils.o \
-    prdfCenSymbol.o \
-    prdfLaneRepair.o \
-    prdfLineDelete.o \
-    prdfMemoryMru.o \
-    prdfPegasusConfigurator.o \
-    prdfRegisterData.o \
-    prdfParserUtils.o
+prd_pegasus_specific += prdfCalloutUtil.o
+prd_pegasus_specific += prdfPhbUtils.o
+prd_pegasus_specific += prdfCenAddress.o
+prd_pegasus_specific += prdfCenDqBitmap.o
+prd_pegasus_specific += prdfCenMbaCaptureData.o
+prd_pegasus_specific += prdfCenMbaCeTable.o
+prd_pegasus_specific += prdfCenMbaRceTable.o
+prd_pegasus_specific += prdfCenMbaTdCtlr.o
+prd_pegasus_specific += prdfCenMbaTdCtlr_common.o
+prd_pegasus_specific += prdfCenMbaThresholds_common.o
+prd_pegasus_specific += prdfCenMbaUeTable.o
+prd_pegasus_specific += prdfCenMemUtils.o
+prd_pegasus_specific += prdfCenSymbol.o
+prd_pegasus_specific += prdfLaneRepair.o
+prd_pegasus_specific += prdfLineDelete.o
+prd_pegasus_specific += prdfMemoryMru.o
+prd_pegasus_specific += prdfPegasusConfigurator.o
+prd_pegasus_specific += prdfRegisterData.o
+prd_pegasus_specific += prdfParserUtils.o
diff --git a/src/usr/diag/prdf/common/prd_ruletable.mk b/src/usr/diag/prdf/common/prd_ruletable.mk
index d0b73f539..030b9bfd3 100755
--- a/src/usr/diag/prdf/common/prd_ruletable.mk
+++ b/src/usr/diag/prdf/common/prd_ruletable.mk
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2005,2013
+# COPYRIGHT International Business Machines Corp. 2005,2014
 #
 # p1
 #
@@ -21,21 +21,19 @@
 #
 # IBM_PROLOG_END_TAG
 
-PRDR_RULE_TABLE_FILES =	\
-	Proc.rule	\
-	Ex.rule		\
-	Mcs.rule	\
-	Membuf.rule \
-	Mba.rule
+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_ruletable = \
- prdrLoadChip.o \
- prdrLoadChipCache.o \
- prdfRuleMetaData.o \
- prdfRuleChip.o \
- prdfGroup.o \
- prdfPluginMap.o \
- prdfRuleFiles.o
+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