summaryrefslogtreecommitdiffstats
path: root/src/tools/image
diff options
context:
space:
mode:
authorShakeeb <shakeebbk@in.ibm.com>2016-08-31 15:15:19 -0500
committerAMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>2016-09-01 07:07:29 -0400
commit1008ef70a71fcfdec398ff30923d5025991c85f4 (patch)
treeb22fc2a7cf2c8414ca20dfc7489a7f6d1a145878 /src/tools/image
parent28cb5c42ddba0cb9d2a86f43785c60499170ef2f (diff)
downloadtalos-sbe-1008ef70a71fcfdec398ff30923d5025991c85f4.tar.gz
talos-sbe-1008ef70a71fcfdec398ff30923d5025991c85f4.zip
SBE code restructure: cleanup
Change-Id: I354cc79ba25b843fdb1a7524a19b8d0c41bd9051 RTC:159709 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29060 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com> Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Diffstat (limited to 'src/tools/image')
-rw-r--r--src/tools/image/Makefile24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/tools/image/Makefile b/src/tools/image/Makefile
index fab89e66..58650875 100644
--- a/src/tools/image/Makefile
+++ b/src/tools/image/Makefile
@@ -6,6 +6,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2015,2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,28 +60,23 @@ else
CXX = g++
endif
-UTILITIES-SOURCES = sbe_default_tool.c
-UTILITIES = sbe_default_tool
-
-# Utility targets
-UTILITIES-OBJc = $(patsubst %.c,$(BASE_OBJDIR)/%.o,$(UTILITIES-SOURCES))
-UTILITIES-OBJECTS += $(patsubst %.C,$(BASE_OBJDIR)/%.o,$(UTILITIES-OBJc))
-UTILITIES-DEPENDENCIES = $(patsubst %.o,%.d,$(UTILITIES-OBJECTS))
-UTILITIES-EXECUTABLES = $(patsubst %,$(BASE_OBJDIR)/%,$(UTILITIES))
-
.PHONY : all utilities clean
-all: utilities
+all:objdir utilities
+
+objdir:
+ mkdir -p $(BASE_OBJDIR)/tools/image
-utilities: $(UTILITIES-EXECUTABLES)
+utilities: $(IMG_DIR)/sbe_default_tool
CXXFLAGS+=-DFAPI2_NO_FFDC
-$(BASE_OBJDIR)/%.o: %.c
+$(BASE_OBJDIR)/tools/image/%.o: %.c
$(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -c -o $@ $<
-$(BASE_OBJDIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/sbe_default_tool.o
+$(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o
$(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^
clean:
- rm -f $(BASE_OBJDIR)/sbe_default_tool*
+ rm -f $(BASE_OBJDIR)/tools/image/sbe_default_tool*
+ rm -f $(IMG_DIR)/sbe_default_tool*
OpenPOWER on IntegriCloud