Merge pull request #173 from dingelish/master

Fix to a static library linking problem.

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

sdk/protected_fs/sgx_tprotected_fs/Makefile

@@ -55,7 +55,7 @@ all: $(LIBNAME) | $(BUILD_DIR)
 	@$(CP) $< $|
 
 $(LIBNAME): sgx_tprotected_fs_t.h $(OBJ)
-	$(AR) rcsD $@ $^
+	$(AR) rcsD $@ $(OBJ)
 	
 sgx_tprotected_fs_t.h: $(EDGER8R)
 	$(EDGER8R) --header-only --trusted $(COMMON_DIR)/inc/sgx_tprotected_fs.edl --search-path $(COMMON_DIR)/inc

sdk/protected_fs/sgx_uprotected_fs/Makefile

@@ -50,7 +50,7 @@ all: $(LIBNAME) | $(BUILD_DIR)
 	$(CP) $< $|
 
 $(LIBNAME): sgx_tprotected_fs_u.h $(OBJ)
-	$(AR) rcsD $@ $^
+	$(AR) rcsD $@ $(OBJ)
 	
 sgx_tprotected_fs_u.h: $(EDGER8R)
 	$(EDGER8R) --header-only --untrusted $(COMMON_DIR)/inc/sgx_tprotected_fs.edl --search-path $(COMMON_DIR)/inc