diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-10-05 15:32:32 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-10-14 17:35:17 -0400 |
| commit | 055aad1e072a479e2f7ab89f60e75ff2ad6c85d6 (patch) | |
| tree | 3d41ad9da905f301dd9ed2a7d46d5e6391bb4f4b /src/occ_405/img_defs.mk | |
| parent | 5cca3dd9adc644ef8cb7bb251f6b43e85ba9f780 (diff) | |
| download | talos-occ-055aad1e072a479e2f7ab89f60e75ff2ad6c85d6.tar.gz talos-occ-055aad1e072a479e2f7ab89f60e75ff2ad6c85d6.zip | |
Sensor List Checking & Make Improvements
Change-Id: Id75021aeeb75c8d63b85e8a80bf09646b8bcf215
RTC:160341
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30752
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Wael El-Essawy <welessa@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/img_defs.mk')
| -rw-r--r-- | src/occ_405/img_defs.mk | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk index e30299e..45ab35d 100644 --- a/src/occ_405/img_defs.mk +++ b/src/occ_405/img_defs.mk @@ -79,6 +79,10 @@ ifndef GLOBAL_INCLUDES export GLOBAL_INCLUDES = -I$(IMAGE_SRCDIR)/.. endif +ifndef OCCTOOLS +export OCCTOOLS = $(abspath ../tools/) +endif + ifndef BASE_OBJDIR export BASE_OBJDIR = $(abspath ../../obj) endif @@ -114,7 +118,7 @@ export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp) endif ifndef PPETOOLS_OBJDIR -export PPETOOLS_OBJDIR = $(abspath ../obj/ppetools) +export PPETOOLS_OBJDIR = $(BASE_OBJDIR)/ppetools endif ifndef TRACEPP_DIR @@ -294,18 +298,26 @@ $(OBJDIR)/%.o: %.S # work as Make targets. The *.d files are include-ed in the # subdirectory Makefiles. -#$(OBJDIR)/%.d: %.c -# @set -e; rm -f $@; \ -# echo -n "$(OBJDIR)/" > $@.$$$$; \ -# $(CC_ASM) -MM $(INCLUDES) $(CPPFLAGS) $(DEFS) $< >> $@.$$$$; \ -# sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ -# rm -f $@.$$$$ - -#$(OBJDIR)/%.d: %.S -# @set -e; rm -f $@; \ -# echo -n "$(OBJDIR)/" > $@.$$$$; \ -# $(CC_ASM) -MM $(INCLUDES) $(CPPFLAGS) $(DEFS) $< >> $@.$$$$; \ -# sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ -# rm -f $@.$$$$ +$(OBJDIR)/%.d: %.c + @set -e; rm -f $@; \ + if [ "$(dir $*)" != "./" ]; then \ + echo -n "$(OBJDIR)/$(dir $*)" > $@.$$$$; \ + else \ + echo -n "$(OBJDIR)/" > $@.$$$$; \ + fi ; \ + $(CC_ASM) -MM $(INCLUDES) $(CPPFLAGS) $(DEFS) $< >> $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ + +$(OBJDIR)/%.d: %.S + @set -e; rm -f $@; \ + if [ "$(dir $*)" != "./" ]; then \ + echo -n "$(OBJDIR)/$(dir $*)" > $@.$$$$; \ + else \ + echo -n "$(OBJDIR)/" > $@.$$$$; \ + fi ; \ + $(CC_ASM) -MM $(INCLUDES) $(CPPFLAGS) $(DEFS) $< >> $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ |
