12 files changed, 116 insertions, 105 deletions
diff --git a/src/usr/cxxtest/TestSuite.C b/src/usr/cxxtest/TestSuite.C
index ab89ef0d7..bdd03244f 100755
--- a/src/usr/cxxtest/TestSuite.C
+++ b/src/usr/cxxtest/TestSuite.C
@@ -1,37 +1,41 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/cxxtest/TestSuite.C $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  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 other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/cxxtest/TestSuite.C $                                 */
+/*                                                                        */
+/* 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                                                     */
 
 // Imported from FSP tree - /src/test/cxxtest/cxxtest/
 
 #ifndef __cxxtest__TestSuite_cpp__
 #define __cxxtest__TestSuite_cpp__
 
+#include <limits.h>
 #include <stdarg.h>
 #include <arch/ppc.H>
 #include <kernel/console.H>
 
 #include <cxxtest/TestSuite.H>
 
+trace_desc_t *g_trac_test = NULL;
+TRAC_INIT(&g_trac_test, "UNIT_TEST", 4*KILOBYTE);
+
 namespace CxxTest
 {
 /******************************************************************************/
diff --git a/src/usr/cxxtest/cxxtestgen.pl b/src/usr/cxxtest/cxxtestgen.pl
index e8f828402..f38c91aa6 100755
--- a/src/usr/cxxtest/cxxtestgen.pl
+++ b/src/usr/cxxtest/cxxtestgen.pl
@@ -6,7 +6,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2012
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
 # p1
 #
@@ -727,9 +727,6 @@ sub write_start() {
   ## $$TODO print   "\tusing namespace TASKARGS;\n";
 
   print   "\n";
-  print   "trace_desc_t *g_trac_test = NULL;\n";
-##  Use same trace buffer for all unit tests, i.e. "UNIT_TEST"
-  print   "TRAC_INIT(&g_trac_test, \"", "UNIT_TEST", "\", 4*KILOBYTE);\n";
 
 
   print   "\n\n";
diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile
index 2a4c723c0..b55be8218 100755
--- a/src/usr/diag/prdf/framework/rule/makefile
+++ b/src/usr/diag/prdf/framework/rule/makefile
@@ -65,7 +65,7 @@ include ../../common/prd_ruletable.mk # for PRDR_RULE_TABLE_TARGETS
 EXTRA_PARTS = $(addprefix ${IMGDIR}/, ${PRDR_RULE_TABLE_TARGETS})
 
 # Clean up the auto generate source files
-EXTRA_CLEAN = ${PRDR_CMP_PATH} \
+CLEAN_TARGETS += ${PRDR_CMP_PATH} \
 			  ${PRDR_CMP_o_PATH} \
 			  ${PRDR_CMP_YACC_o_PATH} \
 			  ${PRDR_CMP_YACC_C_PATH} \
diff --git a/src/usr/ecmddatabuffer/makefile b/src/usr/ecmddatabuffer/makefile
index 4988aff0d..97d6b46ae 100644
--- a/src/usr/ecmddatabuffer/makefile
+++ b/src/usr/ecmddatabuffer/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/ecmddatabuffer/makefile $
+# $Source: src/usr/ecmddatabuffer/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
-#  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 = ../../..
 MODULE = ecmddatabuffer
 
@@ -27,8 +27,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 
-CUSTOMFLAGS += -DPRDF_COMPRESSBUFFER_COMPRESS_FUNCTIONS=1
-CUSTOMFLAGS += -DPRDF_COMPRESSBUFFER_UNCOMPRESS_FUNCTIONS=1
+CFLAGS += -DPRDF_COMPRESSBUFFER_COMPRESS_FUNCTIONS=1
+CFLAGS += -DPRDF_COMPRESSBUFFER_UNCOMPRESS_FUNCTIONS=1
 
 OBJS = ecmdDataBufferBase.o
 
diff --git a/src/usr/errl/parser/makefile b/src/usr/errl/parser/makefile
index 7e5628c05..10a4060ee 100644
--- a/src/usr/errl/parser/makefile
+++ b/src/usr/errl/parser/makefile
@@ -46,18 +46,28 @@ ERRLPARSE_TARGETS = \
 CC=i686-mcp6-g++ -m32
 CFLAGS:=-g -O0   -I $(ROOTPATH)/src/include/usr -I ${GENDIR}
 
-all: gen_pass code_pass
+all: GEN_PASS CODE_PASS
 
-gen_pass:  mkdirs  ${GENDIR}/comps.C ${ERRLPARSE_TARGETS}
+GEN_PASS:  mkdirs  ${GENDIR}/comps.C ${ERRLPARSE_TARGETS}
 
-code_pass: ${IMGDIR}/errlparser
+ifeq ($(MAKECMDGOALS),all)
+CODE_PASS: GEN_PASS
+endif
+ifeq ($(MAKECMDGOALS),)
+CODE_PASS: GEN_PASS
+endif
+
+CODE_PASS: ${IMGDIR}/errlparser
 
 mkdirs:
 	mkdir -p ${OBJDIR}
 	mkdir -p ${GENDIR}
 
 # Generate error log parser code
-${ERRLPARSE_TARGETS} ::
+${ERRLPARSE_TARGETS} : gen_errl_parsers
+
+.PHONY: gen_errl_parsers
+gen_errl_parsers:
 	./genErrlParsers.pl -b ${ROOTPATH} -o ${GENDIR}/plugins
 
 ${GENDIR}/comps.C: ${ROOTPATH}/src/include/usr/hbotcompid.H
@@ -85,5 +95,6 @@ debug:
 	ls -l	${OBJDIR} 
 	ls -l	${IMGDIR}
 	
-beam:
-	# dummy
+BEAM_PASS:
+IMAGE_PASS:
+CLEAN_PASS: clean
diff --git a/src/usr/hwpf/fapi/makefile b/src/usr/hwpf/fapi/makefile
index 0a76de05f..a6b5a3348 100644
--- a/src/usr/hwpf/fapi/makefile
+++ b/src/usr/hwpf/fapi/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2012
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
 # p1
 #
@@ -27,7 +27,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
-CUSTOMFLAGS += -D_NO_SPY_ACCESS=1
+CFLAGS += -D_NO_SPY_ACCESS=1
 
 OBJS =  fapiReturnCode.o \
         fapiReturnCodeDataRef.o \
diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile
index 2b87c1a5b..f84e83f91 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/makefile
+++ b/src/usr/hwpf/hwp/build_winkle_images/makefile
@@ -44,7 +44,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
 
-CUSTOMFLAGS+= -D __FAPI
+CFLAGS += -D __FAPI
 
 
 ##  NOTE: add new object files when you add a new HWP
@@ -59,7 +59,6 @@ OBJS =  build_winkle_images.o   \
         p8_pmc_deconfig_setup.o \
         p8_poreslw_init.o       \
         p8_set_pore_bar.o       \
-        p8_slw_build.o          \
         p8_xip_customize.o      \
         p8_ring_identification.o  \
         p8_slw_build.o          \
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index e489de90e..9c1211562 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -228,7 +228,7 @@ $(call GENTARGET, ${FAPI_ERROR_TARGETS}) : \
 #------------------------------------------------------------------------------
 # The PLAT HWP RC and FFDC parser file generated from Error XML files
 #------------------------------------------------------------------------------
-$(call GENTARGET, ${PLAT_HWP_ERR_PARSER}) : \
+$(call GENPLUGINTARGET, ${PLAT_HWP_ERR_PARSER}) : \
         plat/fapiPlatCreateHwpErrParser.pl ${HWP_ERROR_XML_FILES}
 	$< $(dir $@) ${HWP_ERROR_XML_FILES}
 
@@ -258,7 +258,7 @@ $(foreach initfile,${HWP_INITFILES}, \
 	$(eval $(call HWP_IF_RECIPE,$(initfile))))
 
 ${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/%
-	cp -f $^ $@
+	cp -f $< $@
 
 #------------------------------------------------------------------------------
 # The FAPI Initfile attribute service
diff --git a/src/usr/initservice/build/makefile b/src/usr/initservice/build/makefile
index e9f435c3d..c1ba26a2c 100644
--- a/src/usr/initservice/build/makefile
+++ b/src/usr/initservice/build/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/initservice/build/makefile $
+# $Source: src/usr/initservice/build/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
-#  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
 #
 # makefile for initialization service build tasks.
 #    1.  create isteplist.csv file for spless
@@ -33,11 +33,11 @@ include ${ROOTPATH}/src/usr/parser.mk
 
 OBJFILES=
 
-all: gen_pass code_pass
+all: GEN_PASS CODE_PASS
 
-gen_pass:
+GEN_PASS:
 
-code_pass: ${IMGDIR}/isteplist.csv
+CODE_PASS: GEN_PASS ${IMGDIR}/isteplist.csv
 
 ## find all the ISTEPNAME( #,#,name ) macros in the istep lists and generate 
 ##	the isteplist.csv file for hb-istep 
@@ -56,5 +56,6 @@ debug:
 	ls -l ${OBJDIR} 
 	ls -l ${IMGDIR}
 	
-beam:
-	## dummy
+BEAM_PASS:
+IMAGE_PASS:
+CLEAN_PASS: clean
diff --git a/src/usr/parser.mk b/src/usr/parser.mk
index 2b47925ce..cdec420ae 100644
--- a/src/usr/parser.mk
+++ b/src/usr/parser.mk
@@ -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/parser.mk $
+# $Source: src/usr/parser.mk $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
-#  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
 
 #  This file used by initservice/build/makefile
 #  Not used by errlparser nor plugins as of sprint 9.
@@ -28,5 +28,4 @@
 GENDIR = ${ROOTPATH}/obj/genfiles
 IMGDIR = ${ROOTPATH}/img
 OBJDIR = ${ROOTPATH}/obj/modules/parser
-UD_DIR = ${ROOTPATH}/obj/modules/userdetails
 
diff --git a/src/usr/pore/poreve/makefile b/src/usr/pore/poreve/makefile
index 284de12f5..8d53bc194 100644
--- a/src/usr/pore/poreve/makefile
+++ b/src/usr/pore/poreve/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/pore/poreve/makefile $
+# $Source: src/usr/pore/poreve/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011-2012
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
-#  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
 # Module poreve built from 3 different source code areas:
 #
 # model         The source code of the PoreInterface and PoreModel classes,
@@ -44,7 +44,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 EXTRAINCDIR += ${ROOTPATH}/src/usr/pore/poreve/porevesrc
 
-CUSTOMFLAGS += -DDEBUG_FASTI2C=1 -D_BIG_ENDIAN=1
+CFLAGS += -DDEBUG_FASTI2C=1 -D_BIG_ENDIAN=1
 
 # Override to use C++ compiler for %.c/h files
 CC_OVERRIDE = 1
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index f2e36571c..678f24bdf 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -92,7 +92,7 @@ GENFILES = ${XMLTOHB_TARGETS}
     
 EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(XMLTOHB_SYSTEM_BINARIES))
 
-EXTRA_CLEAN = $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) \
+CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) \
           $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) \
               ${GENDIR}/${XMLTOHB_GENERIC_XML} ${GENDIR}/${XMLTOHB_FAPI_XML} \
               ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES} \