Update makefiles & included .mk files to use += convention.

Change-Id: I4148bc4c770b7c3c10fe25aa18d57d1a4301e5a9
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11194
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

8 files changed, 150 insertions, 155 deletions

diff --git a/src/usr/targeting/common/common.mk b/src/usr/targeting/common/common.mk
index 520f0462d..625e5b9b2 100644
--- a/src/usr/targeting/common/common.mk
+++ b/src/usr/targeting/common/common.mk
@@ -29,34 +29,32 @@
 #
 ################################################################################
 
-COMMON_TARGETING_SUBDIRS = predicates iterators
+COMMON_TARGETING_SUBDIRS += predicates 
+COMMON_TARGETING_SUBDIRS += iterators
 
-PREDICATES_OBJS =           \
-    predicatebase.o         \
-    predicatepostfixexpr.o  \
-    predicatectm.o          \
-    predicateisfunctional.o \
-    predicatehwas.o         \
-    predicatehwaschanged.o  \
-    predicateisnonfunctional.o
+PREDICATES_OBJS += predicatebase.o
+PREDICATES_OBJS += predicatepostfixexpr.o
+PREDICATES_OBJS += predicatectm.o
+PREDICATES_OBJS += predicateisfunctional.o
+PREDICATES_OBJS += predicatehwas.o
+PREDICATES_OBJS += predicatehwaschanged.o
+PREDICATES_OBJS += predicateisnonfunctional.o
 
-ITERATORS_OBJS =        \
-    targetiterator.o    \
-    rawtargetiterator.o \
-    rangefilter.o
+ITERATORS_OBJS += targetiterator.o
+ITERATORS_OBJS += rawtargetiterator.o
+ITERATORS_OBJS += rangefilter.o
 
-TARGET_OBJS =       \
-    target.o        \
-    targetservice.o \
-    entitypath.o
+TARGET_OBJS += target.o
+TARGET_OBJS += targetservice.o
+TARGET_OBJS += entitypath.o
 
-OTHER_OBJS = \
-     util.o utilFilter.o attributeTank.o
+OTHER_OBJS += util.o
+OTHER_OBJS += utilFilter.o
+OTHER_OBJS += attributeTank.o
 
 # Common
-COMMON_TARGETING_OBJS = \
-    ${TARGET_OBJS}      \
-    ${PREDICATES_OBJS}  \
-    ${ITERATORS_OBJS}   \
-    ${OTHER_OBJS}
+COMMON_TARGETING_OBJS += ${TARGET_OBJS}
+COMMON_TARGETING_OBJS += ${PREDICATES_OBJS}
+COMMON_TARGETING_OBJS += ${ITERATORS_OBJS}
+COMMON_TARGETING_OBJS += ${OTHER_OBJS}
 
diff --git a/src/usr/targeting/common/test/common.mk b/src/usr/targeting/common/test/common.mk
index 36e9fed76..b90712f46 100644
--- a/src/usr/targeting/common/test/common.mk
+++ b/src/usr/targeting/common/test/common.mk
@@ -1,36 +1,38 @@
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/targeting/common/test/common.mk $
+# $Source: src/usr/targeting/common/test/common.mk $
 #
-#  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
 
 ################################################################################
 #
 #  @file targeting/common/test/common.mk
 #
-#  @brief Common test makefile to be included in targeting/test/makefile 
+#  @brief Common test makefile to be included in targeting/test/makefile
 #
 ################################################################################
 
-HWPF_INC_DIRS += fapi plat hwp
+HWPF_INC_DIRS += fapi
+HWPF_INC_DIRS += plat
+HWPF_INC_DIRS += hwp
 
-COMMON_TESTCASES = testcommontargeting.H
+COMMON_TESTCASES += testcommontargeting.H
 
-OBJS = ${COMMON_OBJS}
+OBJS += ${COMMON_OBJS}
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index 0c3e20b97..0543c291b 100644
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -29,74 +29,65 @@
 #
 ################################################################################
 
-XMLTOHB_HEADER_TARGETS =        \
-    attributeenums.H            \
-    attributestrings.H          \
-    attributetraits.H           \
-    attributestructs.H          \
-    pnortargeting.H             \
-    fapiplatattrmacros.H        \
-    test_ep.H                   \
-    mapattrmetadata.H           \
-    mapsystemattrsize.H
+XMLTOHB_HEADER_TARGETS += attributeenums.H
+XMLTOHB_HEADER_TARGETS += attributestrings.H
+XMLTOHB_HEADER_TARGETS += attributetraits.H
+XMLTOHB_HEADER_TARGETS += attributestructs.H
+XMLTOHB_HEADER_TARGETS += pnortargeting.H
+XMLTOHB_HEADER_TARGETS += fapiplatattrmacros.H
+XMLTOHB_HEADER_TARGETS += test_ep.H
+XMLTOHB_HEADER_TARGETS += mapattrmetadata.H
+XMLTOHB_HEADER_TARGETS += mapsystemattrsize.H
 
-XMLTOHB_SOURCE_TARGETS = \
-    attributestrings.C   \
-    attributedump.C      \
-    errludattribute.C    \
-    errludtarget.C       \
-    mapattrmetadata.C    \
-    mapsystemattrsize.C
+XMLTOHB_SOURCE_TARGETS += attributestrings.C
+XMLTOHB_SOURCE_TARGETS += attributedump.C
+XMLTOHB_SOURCE_TARGETS += errludattribute.C
+XMLTOHB_SOURCE_TARGETS += errludtarget.C
+XMLTOHB_SOURCE_TARGETS += mapattrmetadata.C
+XMLTOHB_SOURCE_TARGETS += mapsystemattrsize.C
 
-XMLTOHB_SYSTEM_BINARIES =       \
-   vbu_VENICE_targeting.bin     \
-   vbu_MURANO_targeting.bin     \
-   simics_VENICE_targeting.bin  \
-   simics_MURANO_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += vbu_VENICE_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += vbu_MURANO_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += simics_VENICE_targeting.bin
+XMLTOHB_SYSTEM_BINARIES += simics_MURANO_targeting.bin
 
-XMLTOHB_TARGETS =             \
-    ${XMLTOHB_HEADER_TARGETS} \
-    ${XMLTOHB_SOURCE_TARGETS}
+XMLTOHB_TARGETS += ${XMLTOHB_HEADER_TARGETS}
+XMLTOHB_TARGETS += ${XMLTOHB_SOURCE_TARGETS}
 
-XMLTOHB_GENERIC_SOURCES = \
-    attribute_types.xml   \
-    target_types.xml
+FAPI_ATTR_SOURCES += memory_attributes.xml
+FAPI_ATTR_SOURCES += L2_L3_attributes.xml
+FAPI_ATTR_SOURCES += scratch_attributes.xml
+FAPI_ATTR_SOURCES += system_attributes.xml
+FAPI_ATTR_SOURCES += chip_attributes.xml
+FAPI_ATTR_SOURCES += dimm_spd_attributes.xml
+FAPI_ATTR_SOURCES += dimm_attributes.xml
+FAPI_ATTR_SOURCES += unit_attributes.xml
+FAPI_ATTR_SOURCES += freq_attributes.xml
+FAPI_ATTR_SOURCES += ei_bus_attributes.xml
+FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml
+FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml
+FAPI_ATTR_SOURCES += dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml
+FAPI_ATTR_SOURCES += activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml
+FAPI_ATTR_SOURCES += runtime_attributes/pm_hwp_attributes.xml
+FAPI_ATTR_SOURCES += runtime_attributes/pm_plat_attributes.xml
+FAPI_ATTR_SOURCES += nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml
+FAPI_ATTR_SOURCES += dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml
+FAPI_ATTR_SOURCES += common_attributes.xml
+FAPI_ATTR_SOURCES += build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml
+FAPI_ATTR_SOURCES += build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml
+FAPI_ATTR_SOURCES += sync_attributes.xml
+FAPI_ATTR_SOURCES += poreve_memory_attributes.xml
+FAPI_ATTR_SOURCES += mcbist_attributes.xml
+FAPI_ATTR_SOURCES += proc_winkle_scan_override_attributes.xml
+FAPI_ATTR_SOURCES += erepair_thresholds.xml
+FAPI_ATTR_SOURCES += dram_training/mem_pll_setup/memb_pll_ring_attributes.xml
+FAPI_ATTR_SOURCES += runtime_attributes/memory_occ_attributes.xml
+FAPI_ATTR_SOURCES += proc_abus_dmi_xbus_scominit_attributes.xml
 
-FAPI_ATTR_SOURCES =          \
-    memory_attributes.xml    \
-    L2_L3_attributes.xml     \
-    scratch_attributes.xml   \
-    system_attributes.xml    \
-    chip_attributes.xml      \
-    dimm_spd_attributes.xml  \
-    dimm_attributes.xml      \
-    unit_attributes.xml      \
-    freq_attributes.xml      \
-    ei_bus_attributes.xml    \
-    dram_initialization/proc_setup_bars/proc_setup_bars_memory_attributes.xml \
-    dram_initialization/proc_setup_bars/proc_setup_bars_l3_attributes.xml \
-    dram_initialization/proc_setup_bars/proc_setup_bars_mmio_attributes.xml \
-    activate_powerbus/proc_build_smp/proc_fab_smp_fabric_attributes.xml \
-    runtime_attributes/pm_hwp_attributes.xml \
-    runtime_attributes/pm_plat_attributes.xml \
-    nest_chiplets/proc_pcie_scominit/proc_pcie_scominit_attributes.xml \
-    dmi_training/proc_cen_set_inband_addr/proc_cen_set_inband_addr_attributes.xml \
-    common_attributes.xml \
-    build_winkle_images/p8_slw_build/proc_pll_ring_attributes.xml \
-    build_winkle_images/p8_slw_build/p8_xip_customize_attributes.xml \
-    sync_attributes.xml   \
-    poreve_memory_attributes.xml \
-    mcbist_attributes.xml \
-    proc_winkle_scan_override_attributes.xml \
-    erepair_thresholds.xml \
-    dram_training/mem_pll_setup/memb_pll_ring_attributes.xml \
-    runtime_attributes/memory_occ_attributes.xml \
-    proc_abus_dmi_xbus_scominit_attributes.xml
-
-XMLTOHB_GENERIC_XML     = generic.xml
-XMLTOHB_FAPI_XML        = fapiattrs.xml
-XMLTOHB_MERGE_SCRIPT    = mergexml.sh
-XMLTOHB_COMPILER_SCRIPT = xmltohb.pl
-VMM_CONSTS_FILE         = vmmconst.h
+XMLTOHB_GENERIC_XML     += generic.xml
+XMLTOHB_FAPI_XML        += fapiattrs.xml
+XMLTOHB_MERGE_SCRIPT    += mergexml.sh
+XMLTOHB_COMPILER_SCRIPT += xmltohb.pl
+VMM_CONSTS_FILE         += vmmconst.h
 
 GENERATED_CODE = ${XMLTOHB_TARGETS}
diff --git a/src/usr/targeting/hostboot_common.mk b/src/usr/targeting/hostboot_common.mk
index ab70e57f4..09a05ed58 100644
--- a/src/usr/targeting/hostboot_common.mk
+++ b/src/usr/targeting/hostboot_common.mk
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2013
+# COPYRIGHT International Business Machines Corp. 2013,2014
 #
 # p1
 #
@@ -26,8 +26,7 @@ COMMON_TARGETING_MAKEFILE = ${COMMON_TARGETING_REL_PATH}/common.mk
 
 include ${COMMON_TARGETING_MAKEFILE}
 
-VPATH += \
-    ${TARGETING_REL_PATH}/adapters \
-    ${COMMON_TARGETING_REL_PATH} \
-    ${addprefix ${COMMON_TARGETING_REL_PATH}/, ${COMMON_TARGETING_SUBDIRS}}
+VPATH += ${TARGETING_REL_PATH}/adapters
+VPATH += ${COMMON_TARGETING_REL_PATH}
+VPATH += ${addprefix ${COMMON_TARGETING_REL_PATH}/, ${COMMON_TARGETING_SUBDIRS}}
 
diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
index 372354842..15c99fab0 100644
--- a/src/usr/targeting/makefile
+++ b/src/usr/targeting/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2013
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
 # p1
 #
@@ -34,22 +34,18 @@ MODULE = targeting
 TARGETING_REL_PATH = .
 include ${TARGETING_REL_PATH}/hostboot_common.mk
 
-ATTR_RP_OBJS = \
-    attrrp.o   \
-    attrsync.o \
-    targplatutil.o
+ATTR_RP_OBJS += attrrp.o
+ATTR_RP_OBJS += attrsync.o
+ATTR_RP_OBJS += targplatutil.o
 
-ENTRY_POINT_OBJS =       \
-    targetservicestart.o
+ENTRY_POINT_OBJS += targetservicestart.o
 
-DEBUG_OBJS =           \
-    attributestrings.o
+DEBUG_OBJS += attributestrings.o
 
-HOSTBOOT_SPECIFIC_OBJS =    \
-    ${ENTRY_POINT_OBJS}     \
-    ${ATTR_RP_OBJS}         \
-    ${DEBUG_OBJS}           \
-    namedtarget.o
+HOSTBOOT_SPECIFIC_OBJS += ${ENTRY_POINT_OBJS}
+HOSTBOOT_SPECIFIC_OBJS += ${ATTR_RP_OBJS}
+HOSTBOOT_SPECIFIC_OBJS += ${DEBUG_OBJS}
+HOSTBOOT_SPECIFIC_OBJS += namedtarget.o
 
 
 #debug :
@@ -59,9 +55,12 @@ HOSTBOOT_SPECIFIC_OBJS =    \
 #	@echo VPATH = ${VPATH}
 #	@echo COMMON_TARGETING_OBJS = ${COMMON_TARGETING_OBJS}
 
-OBJS = ${COMMON_TARGETING_OBJS} ${HOSTBOOT_SPECIFIC_OBJS}
+OBJS += ${COMMON_TARGETING_OBJS}
+OBJS += ${HOSTBOOT_SPECIFIC_OBJS}
 
-SUBDIRS = test.d xmltohb.d runtime.d
+SUBDIRS += test.d
+SUBDIRS += xmltohb.d
+SUBDIRS += runtime.d
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index 51296c71e..e193f3bc5 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -24,16 +24,19 @@ HOSTBOOT_RUNTIME = 1
 ROOTPATH = ../../../..
 MODULE = targeting_rt
 
-SUBDIRS = test.d
+SUBDIRS += test.d
 
 TARGETING_REL_PATH = ..
 include ${TARGETING_REL_PATH}/hostboot_common.mk
 vpath %.C ${TARGETING_REL_PATH}
 
-HOSTBOOT_RUNTIME_SPECIFIC_OBJS = attrrp_rt.o start_rt.o targplatutil.o \
-                                 rt_targeting.o
+HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrrp_rt.o
+HOSTBOOT_RUNTIME_SPECIFIC_OBJS += start_rt.o
+HOSTBOOT_RUNTIME_SPECIFIC_OBJS += targplatutil.o
+HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_targeting.o
 
-OBJS = ${COMMON_TARGETING_OBJS} ${HOSTBOOT_RUNTIME_SPECIFIC_OBJS}
+OBJS += ${COMMON_TARGETING_OBJS}
+OBJS += ${HOSTBOOT_RUNTIME_SPECIFIC_OBJS}
 
 include $(ROOTPATH)/config.mk
 vpath %.C ${GENDIR}
diff --git a/src/usr/targeting/test/makefile b/src/usr/targeting/test/makefile
index 6d8d3d1e1..1c53e048a 100644
--- a/src/usr/targeting/test/makefile
+++ b/src/usr/targeting/test/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2013
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
 # p1
 #
@@ -24,7 +24,7 @@
 #
 #  @file src/usr/targeting/test/makefile
 #
-#  @brief Makefile for building Hostboot's targeting test dir 
+#  @brief Makefile for building Hostboot's targeting test dir
 #
 ################################################################################
 
@@ -55,16 +55,19 @@ EXTRAINCDIR +=                                       \
     ${ROOTPATH}/src/include/usr/ecmddatabuffer       \
     ../
 
-# Generate the test suite     
+# Generate the test suite
 
 MODULE = testtargeting
 
 COMMON_TESTCASE_REL_PATHS = \
     $(addprefix ${COMMON_TARGETING_REL_PATH}/test/,${COMMON_TESTCASES})
 
-TESTS = testtargeting.H testattrsync.H testattrtank.H ${COMMON_TESTCASE_REL_PATHS}
+TESTS += testtargeting.H
+TESTS += testattrsync.H
+TESTS += testattrtank.H
+TESTS += ${COMMON_TESTCASE_REL_PATHS}
 
-OBJS = attributestrings.o
+OBJS += attributestrings.o
 
 #debug :
 #	@echo EXTRAINCDIR = ${EXTRAINCDIR}
@@ -74,8 +77,8 @@ OBJS = attributestrings.o
 #	@echo INCLUDES = ${INCLUDES}
 #	@echo COMMON_TESTCASE_REL_PATHS = ${COMMON_TESTCASE_REL_PATHS}
 #	@echo COMMON_TESTCASES = ${COMMON_TESTCASES}
-#	@echo HWPF_INC_DIRS = ${HWPF_INC_DIRS} 
-#	@echo TESTS = ${TESTS} 
+#	@echo HWPF_INC_DIRS = ${HWPF_INC_DIRS}
+#	@echo TESTS = ${TESTS}
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index 565f5c704..9e23fcf05 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,2013
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
 # p1
 #
@@ -24,7 +24,7 @@
 #
 #  @file targeting/xmltohb/makefile
 #
-#  @brief Makefile for building Hostboot's xmltohb dir 
+#  @brief Makefile for building Hostboot's xmltohb dir
 #
 ################################################################################
 
@@ -41,7 +41,7 @@ COMMON_TARGETING_MAKEFILE = \
 # Include the common targeting makefile for xmltohb verbatim
 include ${COMMON_TARGETING_MAKEFILE}
 
-VPATH = ${COMMON_TARGETING_REL_PATH}   
+VPATH = ${COMMON_TARGETING_REL_PATH}
 
 FAPI_ATTR_SOURCE_DIR = ${ROOTPATH}/src/usr/hwpf/hwp
 
@@ -56,12 +56,11 @@ XMLTOHB_HB_TARGET_SOURCES               = target_types_hb.xml
 
 XMLTOHB_MERGED_COMMON_TARGET_SOURCES    = target_types_merged.xml
 
-#Redefine XMLTOHB_GENERIC_SOURCES
-XMLTOHB_GENERIC_SOURCES =                               \
-    ${XMLTOHB_COMMON_ATTRIBUTE_SOURCES}                 \
-    ${XMLTOHB_HB_ATTRIBUTE_SOURCES}                     \
-    ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES}   \
-    ${XMLTOHB_HB_TARGET_SOURCES}
+#Define XMLTOHB_GENERIC_SOURCES
+XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_COMMON_ATTRIBUTE_SOURCES}
+XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_ATTRIBUTE_SOURCES}
+XMLTOHB_GENERIC_SOURCES += ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES}
+XMLTOHB_GENERIC_SOURCES += ${XMLTOHB_HB_TARGET_SOURCES}
 
 #XML target types merge script
 XMLTOHB_TARGET_MERGE_SCRIPT = updatetargetxml.pl
@@ -89,15 +88,16 @@ GENFILES = ${XMLTOHB_TARGETS}
 #	@echo XMLTOHB_HB_TARGET_SOURCES = ${XMLTOHB_HB_TARGET_SOURCES}
 #	@echo XMLTOHB_MERGED_COMMON_TARGET_SOURCES = ${XMLTOHB_MERGED_COMMON_TARGET_SOURCES}
 #	@echo VPATH = ${VPATH}
-    
+
 EXTRA_PARTS = $(addprefix $(IMGDIR)/, $(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} \
-              ${GENDIR}/errl/errludattribute.H \
-              ${GENDIR}/errl/errludtarget.H
+CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) 
+CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml})
+CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_GENERIC_XML}
+CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_FAPI_XML}
+CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_MERGED_COMMON_TARGET_SOURCES}
+CLEAN_TARGETS += ${GENDIR}/errl/errludattribute.H
+CLEAN_TARGETS += ${GENDIR}/errl/errludtarget.H
 
 GENDIR_ERRL = $(ROOTPATH)/obj/genfiles/errl
 
@@ -106,7 +106,7 @@ CLEAN_TARGETS += $(XMLTOHB_RAN_INDICATION)
 
 include ${ROOTPATH}/config.mk
 
-# Delete any generated file on error 
+# Delete any generated file on error
 .DELETE_ON_ERROR:
 
 ${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/%