Merge pull request #197 from dingelish/master

Fix improper Makefile for tprotected_fs and uprotected_fs. And fix a typo in sample project.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com

SampleCode/RemoteAttestation/service_provider/service_provider.cpp

@@ -588,7 +588,7 @@ int sp_ra_proc_msg3_req(const sample_ra_msg3_t *p_msg3,
             break;
         }
         FILE* OUTPUT = stdout;
-        fprintf(OUTPUT, "\n\n\tAtestation Report:");
+        fprintf(OUTPUT, "\n\n\tAttestation Report:");
         fprintf(OUTPUT, "\n\tid: 0x%0x.", attestation_report.id);
         fprintf(OUTPUT, "\n\tstatus: %d.", attestation_report.status);
         fprintf(OUTPUT, "\n\trevocation_reason: %u.",

sdk/protected_fs/sgx_tprotected_fs/Makefile

@@ -63,7 +63,7 @@ sgx_tprotected_fs_t.h: $(EDGER8R)
 $(EDGER8R):
 	$(MAKE) -C $(EDGER8R_DIR)
 
-$(OBJ): %.o :%.cpp
+$(OBJ): %.o :%.cpp sgx_tprotected_fs_t.h
 	$(CXX) $(CXXFLAGS) $(INCLUDE)  -c $< -o $@
 
 $(BUILD_DIR):

sdk/protected_fs/sgx_uprotected_fs/Makefile

@@ -56,6 +56,8 @@ $(LIBNAME): sgx_tprotected_fs_u.h $(OBJ)
 sgx_tprotected_fs_u.h: $(EDGER8R)
 	$(EDGER8R) --header-only --untrusted $(COMMON_DIR)/inc/sgx_tprotected_fs.edl --search-path $(COMMON_DIR)/inc
 
+$(OBJ): %.o :%.cpp sgx_tprotected_fs_u.h
+	$(CXX) $(CXXFLAGS) $(INCLUDE)  -c $< -o $@
 $(EDGER8R):
 	$(MAKE) -C $(EDGER8R_DIR)