summaryrefslogtreecommitdiffstats
path: root/tools/image/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'tools/image/Makefile')
-rw-r--r--tools/image/Makefile45
1 files changed, 7 insertions, 38 deletions
diff --git a/tools/image/Makefile b/tools/image/Makefile
index 0afc09ee..a7da7ae9 100644
--- a/tools/image/Makefile
+++ b/tools/image/Makefile
@@ -20,36 +20,6 @@ $(warning CTEPATH not defined; defaulting to awd)
CTEPATH = /afs/awd/projects/cte
endif
-
-# Are we setup for eCMD, if so let's get our eCMD Release from there
-ifneq ($(strip $(ECMD_RELEASE)),)
- ECMD_RELEASE := $(shell ecmdVersion full)
- # Make sure we got a valid version back
- ifeq ($(findstring ver,$(ECMD_RELEASE)),)
- ECMD_RELEASE := rel
- endif
-else
- # If not setup for eCMD, default to rel
- ECMD_RELEASE := rel
-endif
-
-
-# Ok, now set our eCMD Path, if not set already
-ifeq ($(strip $(ECMD_PATH)),)
- ECMD_PATH := ${CTEPATH}/tools/ecmd/${ECMD_RELEASE}/
-endif
-
-ifeq ($(strip $(ECMD_PLUGIN)),cro)
-# Cronus plugin specific setup
- CRONUS_PATH := $(shell echo ${ECMD_EXE} | sed -n 's|\([a-zA-Z0-9]*\)\(_*\)\([a-zA-Z0-9]*\)_x86\.exe|prcd_d|p')
- ifeq ($(strip $(CRONUS_PATH)),)
- $(error "Error determining CRONUS_PATH from env!")
- endif
-endif
-
-# We need common up-to-date headers for FAPI - currently using these.
-FAPI = $(ECMD_PATH)ext/fapi
-
# Locations of required headers.
INCLUDES += -I. -I../../ -I../../utils
INCLUDES += -I ../../sbe/image/
@@ -63,10 +33,6 @@ INCLUDES += -I ../../pk/trace/
INCLUDES += -I ../../tools/ppetracepp/
INCLUDES += -I ../../importtemp/fapi2/include/
-INCLUDES += -I$(CRONUS_PATH)
-INCLUDES += -I$(ECMD_PATH)/capi
-INCLUDES += -I$(FAPI)/capi
-
# Under Linux the scheme is to use a common compiler to create procedures.
# However, the common compiler can be VERY slow, so if the system compiler is
# also 4.1.2 we're using that one instead. Also, the Linux FAPI libraries we
@@ -101,8 +67,11 @@ UTILITIES-DEPENDENCIES = $(patsubst %.o,%.d,$(UTILITIES-OBJECTS))
UTILITIES-EXECUTABLES = $(patsubst %,bin/%,$(UTILITIES))
-.PHONY : utilities
-utilities: $(UTILITIES-EXECUTABLES)
+.PHONY : utilities buildBinDir
+utilities: buildBinDir $(UTILITIES-EXECUTABLES)
+
+buildBinDir:
+ mkdir -p bin
bin/%.o: %.c
$(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -DDEBUG_SBE_XIP_IMAGE=1 -DFAPI2_NO_FFDC -c -o $@ $<
@@ -119,6 +88,6 @@ bin/sbe_default_tool: bin/sbe_xip_image.o bin/sbe_default_tool.o
ln -sf bin/sbe_default_tool sbe_default_tool
clean:
- rm sbe_xip_tool sbe_default_tool
+ rm -f sbe_xip_tool sbe_default_tool
rm -rf bin
- mkdir -p bin \ No newline at end of file
+ mkdir -p bin
OpenPOWER on IntegriCloud