Refact TRUSTED_DIR -> SGXTrustedStaticLibrary/makefiles/c++/

Signed-off-by: Ícaro Dantas de Araújo Lima <icaro.lima@ccc.ufcg.edu.br>

Author: icarolima

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c++/sgx_t_static.mk

@@ -2,6 +2,7 @@
 SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64
+TRUSTED_DIR=static_trusted
 
 ifeq ($(shell getconf LONG_BIT), 32)
 	SGX_ARCH := x86
@@ -43,7 +44,7 @@ endif
 
 Crypto_Library_Name := sgx_tcrypto
 
-$(EnclaveName)_Cpp_Files := static_trusted/$(enclaveName).cpp 
+$(EnclaveName)_Cpp_Files := $(TRUSTED_DIR)/$(enclaveName).cpp 
 $(EnclaveName)_C_Files := 
 $(EnclaveName)_Include_Paths := -IInclude -I$(EnclaveName) -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/libcxx
 
@@ -81,25 +82,25 @@ all: lib$(enclaveName).sgx.static.lib.a
 
 ######## $(enclaveName) Objects ########
 
-static_trusted/$(enclaveName)_t.h: $(SGX_EDGER8R) ./static_trusted/$(enclaveName).edl
-	@cd ./static_trusted && $(SGX_EDGER8R) --header-only  --trusted ../static_trusted/$(enclaveName).edl --search-path ../static_trusted --search-path $(SGX_SDK)/include
+$(TRUSTED_DIR)/$(enclaveName)_t.h: $(SGX_EDGER8R) ./$(TRUSTED_DIR)/$(enclaveName).edl
+	@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --header-only  --trusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
 	@echo "GEN  =>  $@"
 
-static_trusted/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
+$(TRUSTED_DIR)/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
 	@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
 	@echo "CC   <=  $<"
 
-static_trusted/%.o: static_trusted/%.cpp
+$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.cpp
 	@$(CXX) $($(EnclaveName)_Include_Paths) $($(EnclaveName)_Cpp_Flags) -c $< -o $@
 	@echo "CXX  <=  $<"
 
-static_trusted/%.o: static_trusted/%.c
+$(TRUSTED_DIR)/%.o: $(TRUSTED_DIR)/%.c
 	@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
 	@echo "CC  <=  $<"
 
-lib$(enclaveName).sgx.static.lib.a: static_trusted/$(enclaveName)_t.h $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
+lib$(enclaveName).sgx.static.lib.a: $(TRUSTED_DIR)/$(enclaveName)_t.h $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
 	ar rcs lib$(enclaveName).sgx.static.lib.a $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)  
 	@echo "LINK =>  $@"
 
 clean:
-	@rm -f $(enclaveName).* static_trusted/$(enclaveName)_t.* $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)
+	@rm -f $(enclaveName).* $(TRUSTED_DIR)/$(enclaveName)_t.* $($(EnclaveName)_Cpp_Objects) $($(EnclaveName)_C_Objects)

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c++/sgx_u.without_app.mk

@@ -3,6 +3,7 @@ SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64
 UNTRUSTED_DIR=untrusted
+TRUSTED_DIR=static_trusted
 
 ifeq ($(shell getconf LONG_BIT), 32)
 	SGX_ARCH := x86
@@ -56,9 +57,9 @@ all: $(UNTRUSTED_DIR)/$(enclaveName)_u.o
 
 ######## App Objects ########
 
-$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) static_trusted/$(enclaveName).edl
+$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) $(TRUSTED_DIR)/$(enclaveName).edl
 	@mkdir -p $(UNTRUSTED_DIR)
-	@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../static_trusted/$(enclaveName).edl --search-path ../static_trusted --search-path $(SGX_SDK)/include
+	@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
 	@echo "GEN  =>  $@"
 
 $(UNTRUSTED_DIR)/$(enclaveName)_u.o: $(UNTRUSTED_DIR)/$(enclaveName)_u.c

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c/sgx_t_static.mk

@@ -57,7 +57,7 @@ $(EnclaveName)_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -
 	-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
 	-Wl,-pie,-eenclave_entry -Wl,--export-dynamic  \
 	-Wl,--defsym,__ImageBase=0 \
-	-Wl,--version-script=trusted/$(enclaveName).lds
+	-Wl,--version-script=$(TRUSTED_DIR)/$(enclaveName).lds
 
 $(EnclaveName)_C_Objects := $($(EnclaveName)_C_Files:.c=.o)
 
@@ -80,7 +80,7 @@ $(TRUSTED_DIR)/$(enclaveName)_t.h: $(SGX_EDGER8R) ./$(TRUSTED_DIR)/$(enclaveName
 	@cd ./$(TRUSTED_DIR) && $(SGX_EDGER8R) --header-only  --trusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../$(TRUSTED_DIR) --search-path $(SGX_SDK)/include
 	@echo "GEN  =>  $@"
 
-$(TRUSTED_DIR)/$(enclaveName)_t.o: ./trusted/$(enclaveName)_t.c
+$(TRUSTED_DIR)/$(enclaveName)_t.o: ./$(TRUSTED_DIR)/$(enclaveName)_t.c
 	@$(CC) $($(EnclaveName)_C_Flags) -c $< -o $@
 	@echo "CC   <=  $<"
 

Linux_SGXEclipsePlugin/build_directory/plugins/com.intel.sgx/templates/sgx/SGXTrustedStaticLibrary/makefiles/c/sgx_u.without_app.mk

@@ -3,6 +3,7 @@ SGX_SDK ?= $(SdkPathFromPlugin)
 SGX_MODE ?= SIM
 SGX_ARCH ?= x64
 UNTRUSTED_DIR=untrusted
+TRUSTED_DIR=static_trusted
 
 ifeq ($(shell getconf LONG_BIT), 32)
 	SGX_ARCH := x86
@@ -55,9 +56,9 @@ all: $(UNTRUSTED_DIR)/$(enclaveName)_u.o
 
 ######## App Objects ########
 
-$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) static_trusted/$(enclaveName).edl
+$(UNTRUSTED_DIR)/$(enclaveName)_u.c: $(SGX_EDGER8R) $(TRUSTED_DIR)/$(enclaveName).edl
 	@mkdir -p $(UNTRUSTED_DIR)
-	@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../static_trusted/$(enclaveName).edl --search-path ../static_trusted --search-path $(SGX_SDK)/include
+	@cd $(UNTRUSTED_DIR) && $(SGX_EDGER8R) --untrusted ../$(TRUSTED_DIR)/$(enclaveName).edl --search-path ../static_trusted --search-path $(SGX_SDK)/include
 	@echo "GEN  =>  $@"
 
 $(UNTRUSTED_DIR)/$(enclaveName)_u.o: $(UNTRUSTED_DIR)/$(enclaveName)_u.c