summaryrefslogtreecommitdiffstats
path: root/src/Makefile
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2015-02-11 17:02:41 -0600
committerStephan Broyles <sbroyles@us.ibm.com>2015-02-12 14:37:59 -0600
commit6d0342e8707fd3b393936e114d7715966ad17b8c (patch)
tree68dadcbd82d2b053e89784e12559baec3e5e29ec /src/Makefile
parent2adf5f493db7436dd0df0fcb846c16b93dd1f374 (diff)
downloadtalos-occ-6d0342e8707fd3b393936e114d7715966ad17b8c.tar.gz
talos-occ-6d0342e8707fd3b393936e114d7715966ad17b8c.zip
Infrastructure fixes for makefiles
Change-Id: I867d760d5bed3d180590ba321f0456c9d58b95c3 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15673 Reviewed-by: Stephan Broyles <sbroyles@us.ibm.com> Tested-by: Stephan Broyles <sbroyles@us.ibm.com>
Diffstat (limited to 'src/Makefile')
-rwxr-xr-xsrc/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile
index 7dec650..d90b2f0 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,9 +10,9 @@ endif
SUBDIRS = tracepp occBootLoader occ occApplet
COMBINE_IMAGE_SUBDIRS = occBootLoader occ occApplet
CLEAN_SUBDIRS = occBootLoader occ occApplet ssx/pgp lib
-CLEANCMD = $(MAKE) clean -C $(dir);
-ALLCMD = $(MAKE) -j6 -C $(dir);
-COMBINEIMAGE = $(MAKE) combineImage -C $(dir);
+CLEANCMD = $(MAKE) clean -C $(dir)
+ALLCMD = $(MAKE) -C $(dir)
+COMBINEIMAGE = $(MAKE) combineImage -C $(dir)
IMAGEFILE = image.bin
export TRACEPP = $(ROOTPATH)/tracepp/tracepp
@@ -22,7 +22,7 @@ TRACEHASH = $(ROOTPATH)/tracepp/tracehash.pl
# Compilation
#*******************************************************************************
all:
- $(foreach dir,$(SUBDIRS),$(ALLCMD))
+ $(foreach dir,$(SUBDIRS),$(ALLCMD) &&) true
#*******************************************************************************
# Combine Objects/Executables into OCC Image
@@ -30,7 +30,7 @@ all:
.PHONY : combineImage
combineImage:
rm -rf $(IMAGEFILE)
- $(foreach dir,$(COMBINE_IMAGE_SUBDIRS),$(COMBINEIMAGE))
+ $(foreach dir,$(COMBINE_IMAGE_SUBDIRS),$(COMBINEIMAGE) &&) true
#*******************************************************************************
# Create lid or ruhx out of OCC Image
@@ -63,6 +63,6 @@ srcPluginFile:
# Clean
#*******************************************************************************
clean:
- $(foreach dir,$(CLEAN_SUBDIRS),$(CLEANCMD))
+ $(foreach dir,$(CLEAN_SUBDIRS),$(CLEANCMD) &&) true
rm -rf image.bin
OpenPOWER on IntegriCloud