15 files changed, 297 insertions, 290 deletions
diff --git a/src/usr/diag/attn/makefile b/src/usr/diag/attn/makefile
index 482913889..33ccd97a2 100644
--- a/src/usr/diag/attn/makefile
+++ b/src/usr/diag/attn/makefile
@@ -1,34 +1,41 @@
-#   IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/diag/attn/makefile $
+# $Source: src/usr/diag/attn/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# 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 other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# 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
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 ROOTPATH = ../../../..
 
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag
 
 MODULE = attn
 
-OBJS =  attntrace.o attn.o attnsvc.o attnlist.o attnbits.o attntarget.o \
-        attnscom.o attnproc.o attnmem.o
+OBJS += attntrace.o
+OBJS += attn.o
+OBJS += attnsvc.o
+OBJS += attnlist.o
+OBJS += attnbits.o
+OBJS += attntarget.o
+OBJS += attnscom.o
+OBJS += attnproc.o
+OBJS += attnmem.o
 
-SUBDIRS = test.d
+SUBDIRS += test.d
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/attn/test/makefile b/src/usr/diag/attn/test/makefile
index 4159eb873..659a43dd2 100644
--- a/src/usr/diag/attn/test/makefile
+++ b/src/usr/diag/attn/test/makefile
@@ -1,32 +1,42 @@
-#   IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/diag/attn/test/makefile $
+# $Source: src/usr/diag/attn/test/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# 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 other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# 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
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 ROOTPATH = ../../../../..
 
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag
 
-OBJS = attnfakesys.o attntest.o attnrand.o attnfakepresenter.o attnfakeprd.o \
-       attnfaketarget.o attnrandsource.o attnfakegfir.o attnfakeipoll.o \
-       attnvalidate.o attnfakemcs.o attnfakegp1.o attnmeminject.o
+OBJS += attnfakesys.o
+OBJS += attntest.o
+OBJS += attnrand.o
+OBJS += attnfakepresenter.o
+OBJS += attnfakeprd.o
+OBJS += attnfaketarget.o
+OBJS += attnrandsource.o
+OBJS += attnfakegfir.o
+OBJS += attnfakeipoll.o
+OBJS += attnvalidate.o
+OBJS += attnfakemcs.o
+OBJS += attnfakegp1.o
+OBJS += attnmeminject.o
 
 MODULE = testattn
 
diff --git a/src/usr/diag/makefile b/src/usr/diag/makefile
index 3518d118c..b00674a74 100644
--- a/src/usr/diag/makefile
+++ b/src/usr/diag/makefile
@@ -1,27 +1,29 @@
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/diag/makefile $
+# $Source: src/usr/diag/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# 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 other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# 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
+# Origin: 30
 #
-#  IBM_PROLOG_END
+# IBM_PROLOG_END_TAG
 ROOTPATH = ../../..
 
-SUBDIRS = mdia.d prdf.d attn.d
+SUBDIRS += mdia.d
+SUBDIRS += prdf.d
+SUBDIRS += attn.d
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/mdia/makefile b/src/usr/diag/mdia/makefile
index 1dd5ee36f..98133a780 100644
--- a/src/usr/diag/mdia/makefile
+++ b/src/usr/diag/mdia/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2012,2013
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
 # p1
 #
@@ -37,8 +37,13 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp
 
 MODULE = mdia
 
-OBJS =  mdiamonitor.o mdiatrace.o mdiaworkitem.o mdiamba.o mdia.o mdiasm.o
+OBJS += mdiamonitor.o
+OBJS += mdiatrace.o
+OBJS += mdiaworkitem.o
+OBJS += mdiamba.o
+OBJS += mdia.o
+OBJS += mdiasm.o
 
-SUBDIRS = test.d
+SUBDIRS += test.d
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/mdia/test/makefile b/src/usr/diag/mdia/test/makefile
index 573666556..3421ec4b4 100644
--- a/src/usr/diag/mdia/test/makefile
+++ b/src/usr/diag/mdia/test/makefile
@@ -1,25 +1,25 @@
-#   IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/diag/mdia/test/makefile $
+# $Source: src/usr/diag/mdia/test/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# 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 other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# 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
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 ROOTPATH = ../../../../..
 
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/diag
@@ -36,7 +36,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 ##########################################################
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp
 
-OBJS = mdiafakesm.o mdiafakecm.o
+OBJS += mdiafakesm.o
+OBJS += mdiafakecm.o
 
 MODULE = testmdia
 
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
 
diff --git a/src/usr/diag/prdf/framework/makefile b/src/usr/diag/prdf/framework/makefile
index b9eebaea2..b3761c015 100755
--- a/src/usr/diag/prdf/framework/makefile
+++ b/src/usr/diag/prdf/framework/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2012,2013
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
 # p1
 #
@@ -23,7 +23,7 @@
 
 ROOTPATH = ../../../../..
 
-SUBDIRS = rule.d
+SUBDIRS += rule.d
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile
index 3aa4efaaa..48d70f67c 100755
--- a/src/usr/diag/prdf/framework/rule/makefile
+++ b/src/usr/diag/prdf/framework/rule/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2012,2013
+# COPYRIGHT International Business Machines Corp. 2012,2014
 #
 # p1
 #
@@ -82,42 +82,44 @@ REG_PLUGIN_PATHS = $(addprefix ${OBJ_PLUG_DIR}/, ${REG_PLUGIN_TARGETS})
 #-------------------------------------------------------------------------------
 
 # Entire directories to link.
-SOURCE_PLUGIN_DIRS = \
-	${SRC_USR}/common/plugins \
-	${SRC_USR}/plugins
+SOURCE_PLUGIN_DIRS += ${SRC_USR}/common/plugins
+SOURCE_PLUGIN_DIRS += ${SRC_USR}/plugins
 
 # Individual source files to link.
-SOURCE_PLUGIN_FILES = \
-	${SRC_USR}/common/framework/rule/tables.mk \
-	${SRC_USR}/common/util/UtilHash.H \
-	${SRC_USR}/common/plat/pegasus/prdfCenConst.H \
-	${SRC_USR}/common/iipconst.h \
-	${SRC_USR}/common/prdf_types.h \
-	${SRC_INC}/common/prdf_service_codes.H \
-	$(foreach d, ${SOURCE_PLUGIN_DIRS}, \
-		      $(addprefix $(d)/, $(notdir $(wildcard ${ROOTPATH}/$(d)/*))))
-
-LINK_PLUGIN_FILES = \
-	$(addprefix ${OBJ_PLUG_DIR}/,$(notdir ${SOURCE_PLUGIN_FILES}))
+SOURCE_PLUGIN_FILES += ${SRC_USR}/common/framework/rule/tables.mk
+SOURCE_PLUGIN_FILES += ${SRC_USR}/common/util/UtilHash.H
+SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H
+SOURCE_PLUGIN_FILES += ${SRC_USR}/common/iipconst.h
+SOURCE_PLUGIN_FILES += ${SRC_USR}/common/prdf_types.h
+SOURCE_PLUGIN_FILES += ${SRC_INC}/common/prdf_service_codes.H
+SOURCE_PLUGIN_FILES += $(foreach d, ${SOURCE_PLUGIN_DIRS}, $(addprefix $(d)/, $(notdir $(wildcard ${ROOTPATH}/$(d)/*))))
+
+LINK_PLUGIN_FILES += $(addprefix ${OBJ_PLUG_DIR}/,$(notdir ${SOURCE_PLUGIN_FILES}))
 
 #-------------------------------------------------------------------------------
 # CODE_PASS
 #-------------------------------------------------------------------------------
 
-CODE_PASS_BODY += \
-	${PRF_IMG_PATHS} ${ERR_PLUGIN_PATHS} ${REG_PLUGIN_PATHS} \
-	${LINK_PLUGIN_FILES}
-
-CLEAN_TARGETS += \
-	${PRDR_CMP_PATH} ${PRDR_CMP_o_PATH} \
-	${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_YACC_C_PATH} \
-	${PRDR_CMP_YACC_H_PATH} ${PRDR_CMP_FLEX_o_PATH} ${PRDR_CMP_FLEX_C_PATH} \
-	$(addprefix ${OBJ_RULE_DIR}/, ${PRDR_RULE_TABLE_TARGETS}) \
-	$(addprefix ${OBJ_RULE_DIR}/, ${ERR_PLUGIN_TARGETS}) \
-	$(addprefix ${OBJ_RULE_DIR}/, ${REG_PLUGIN_TARGETS}) \
-	$(addprefix ${OBJ_RULE_DIR}/, ${HTML_PLUGIN_TARGETS}) \
-	${PRF_IMG_PATHS} ${ERR_PLUGIN_PATHS} ${REG_PLUGIN_PATHS} \
-	${LINK_PLUGIN_FILES}
+CODE_PASS_BODY += ${PRF_IMG_PATHS}
+CODE_PASS_BODY += ${ERR_PLUGIN_PATHS}
+CODE_PASS_BODY += ${REG_PLUGIN_PATHS}
+CODE_PASS_BODY += ${LINK_PLUGIN_FILES}
+
+CLEAN_TARGETS += ${PRDR_CMP_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_o_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_YACC_o_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_YACC_C_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_YACC_H_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_FLEX_o_PATH}
+CLEAN_TARGETS += ${PRDR_CMP_FLEX_C_PATH}
+CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${PRDR_RULE_TABLE_TARGETS})
+CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${ERR_PLUGIN_TARGETS})
+CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${REG_PLUGIN_TARGETS})
+CLEAN_TARGETS += $(addprefix ${OBJ_RULE_DIR}/, ${HTML_PLUGIN_TARGETS})
+CLEAN_TARGETS += ${PRF_IMG_PATHS}
+CLEAN_TARGETS += ${ERR_PLUGIN_PATHS}
+CLEAN_TARGETS += ${REG_PLUGIN_PATHS}
+CLEAN_TARGETS += ${LINK_PLUGIN_FILES}
 
 # NOTE: All rules defined in this makefile must be done after this line
 #       otherwise the default rule 'all' will not be called.
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index 9d24869ad..2e28d41bb 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -33,27 +33,26 @@ MODULE = prdf
 #------------------------------------------------------------------------------
 PRD_USR_PATH = ${ROOTPATH}/src/usr/diag/prdf
 
-VPATH =  \
-    common \
-    common/util \
-    common/plat \
-    common/plat/pegasus \
-    common/framework \
-    common/framework/resolution \
-    common/framework/register \
-    common/framework/service \
-    common/framework/config \
-    common/framework/rule \
-    common/mnfgtools \
-    mnfgtools \
-    framework \
-    framework/config \
-    framework/rule \
-    framework/service \
-    framework/resolution \
-    plat \
-    plat/pegasus \
-    common/plugins
+VPATH += common
+VPATH += common/util
+VPATH += common/plat
+VPATH += common/plat/pegasus
+VPATH += common/framework
+VPATH += common/framework/resolution
+VPATH += common/framework/register
+VPATH += common/framework/service
+VPATH += common/framework/config
+VPATH += common/framework/rule
+VPATH += common/mnfgtools
+VPATH += mnfgtools
+VPATH += framework
+VPATH += framework/config
+VPATH += framework/rule
+VPATH += framework/service
+VPATH += framework/resolution
+VPATH += plat
+VPATH += plat/pegasus
+VPATH += common/plugins
 
 #FIXME: we can remove most of these as well if we have them include correctly
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
@@ -100,15 +99,14 @@ include common/prd_ruletable.mk
 include common/prd_pegasus.mk
 include prdf_hb_only.mk
 
-OBJS = \
- ${prd_object_files} \
- ${prd_object_files_no_sim} \
- ${prd_ruletable} \
- ${prd_pegasus_specific} \
- ${prd_object_files_HB} \
- ${PRDF_RULE_PLUGINS_PEGASUS} \
- ${PRDF_RULE_PLUGINS_PEGASUS_HB} \
- ${PRDF_RULE_PLUGINS_PEGASUS_WSIM} \
+OBJS += ${prd_object_files}
+OBJS += ${prd_object_files_no_sim}
+OBJS += ${prd_ruletable}
+OBJS += ${prd_pegasus_specific}
+OBJS += ${prd_object_files_HB}
+OBJS += ${PRDF_RULE_PLUGINS_PEGASUS}
+OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_HB}
+OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_WSIM}
 
 #------------------------------------------------------------------------------
 # Generated Mfg Threshold Header file
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index af7ef5221..bf722261c 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -32,20 +32,16 @@ PRDF_RULE_PLUGINS_PEGASUS_HB = \
 # PRD object files (Hostboot only).
 ################################################################################
 
-prd_config_HB = \
- prdfMbaDomain.o \
+prd_config_HB += prdfMbaDomain.o
 
-prd_mnfgtools_HB = \
- prdfMfgThresholdFile.o \
- prdfMfgSync.o
+prd_mnfgtools_HB += prdfMfgThresholdFile.o
+prd_mnfgtools_HB += prdfMfgSync.o
 
-prd_plat_HB = \
- prdfCenMbaIplCeStats.o \
- prdfDramRepairs.o \
- prdfRasServices.o \
- prdfPlatCalloutUtil.o
+prd_plat_HB += prdfCenMbaIplCeStats.o
+prd_plat_HB += prdfDramRepairs.o
+prd_plat_HB += prdfRasServices.o
+prd_plat_HB += prdfPlatCalloutUtil.o
 
-prd_object_files_HB = \
- ${prd_config_HB} \
- ${prd_mnfgtools_HB} \
- ${prd_plat_HB}
+prd_object_files_HB += ${prd_config_HB}
+prd_object_files_HB += ${prd_mnfgtools_HB}
+prd_object_files_HB += ${prd_plat_HB}
diff --git a/src/usr/diag/prdf/test/makefile b/src/usr/diag/prdf/test/makefile
index 03de64d58..e0170033c 100755
--- a/src/usr/diag/prdf/test/makefile
+++ b/src/usr/diag/prdf/test/makefile
@@ -59,29 +59,29 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 # objects
 #------------------------------------------------------------------------------
 
-OBJS = prdfsimHomRegisterAccess.o \
-       prdfsimRasServices.o \
-       prdfsimScrDataSet.o \
-       prdfsimScrDB.o \
-       prdfsimServices.o \
-       prdsimSignatureParser.o \
-       prdfsimUtil.o \
-       prdfsimMfgSync.o \
-       prdfsimFspSyncSvc.o \
-       prdfsimFspMfgThresholdFile.o
+OBJS += prdfsimHomRegisterAccess.o
+OBJS += prdfsimRasServices.o
+OBJS += prdfsimScrDataSet.o
+OBJS += prdfsimScrDB.o
+OBJS += prdfsimServices.o
+OBJS += prdsimSignatureParser.o
+OBJS += prdfsimUtil.o
+OBJS += prdfsimMfgSync.o
+OBJS += prdfsimFspSyncSvc.o
+OBJS += prdfsimFspMfgThresholdFile.o
 
-TESTS = prdfTest_MfgSync.H \
-        prdfTest_ABus.H \
-        prdfTest_Ex.H  \
-        prdfTest.H  \
-        prdfTest_Mba.H  \
-        prdfTest_Mcs.H  \
-        prdfTest_Proc.H  \
-        prdfTest_XBus.H \
-        prdfTest_McsMciFir.H \
-        prdfTest_ProcCentFir.H \
-        prdfTest_ProcMbsFir.H \
-        prdfTest_ProcTpLFir.H \
-		prdfTest_CentCs.H
+TESTS += prdfTest_MfgSync.H
+TESTS += prdfTest_ABus.H
+TESTS += prdfTest_Ex.H
+TESTS += prdfTest.H
+TESTS += prdfTest_Mba.H
+TESTS += prdfTest_Mcs.H
+TESTS += prdfTest_Proc.H
+TESTS += prdfTest_XBus.H
+TESTS += prdfTest_McsMciFir.H
+TESTS += prdfTest_ProcCentFir.H
+TESTS += prdfTest_ProcMbsFir.H
+TESTS += prdfTest_ProcTpLFir.H
+TESTS += prdfTest_CentCs.H
 
 include ${ROOTPATH}/config.mk