[Title] Modify makefile in CLI

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#] 8871
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ic0eb4cd1065531d02f89fea9c97c9c8071019728

diff --git a/package/addingFiles/template/makefile/makefile_app_template b/package/addingFiles/template/makefile/makefile_app_template
index d7b95b6..4cab098 100644 (file)
--- a/package/addingFiles/template/makefile/makefile_app_template
+++ b/package/addingFiles/template/makefile/makefile_app_template
@@ -37,14 +37,13 @@ src \
 
 # -include src/subdir.mk
 # Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-$(CLI_SRC)
+CPP_SRCS += $(wildcard ../src/*.cpp)
 
-OBJS += \
-$(CLI_OBJ)
+TMP_FILES += $(patsubst ../src/%, ./src/%, $(CPP_SRCS))
 
-CPP_DEPS += \
-$(CLI_DEPS)
+OBJS += $(TMP_FILES:.cpp=.o)
+
+CPP_DEPS += $(TMP_FILES:.cpp=.d)
 
 # Each subdirectory must supply rules for building sources it contributes
 src/%.o: ../src/%.cpp

diff --git a/package/addingFiles/template/makefile/makefile_shared_template b/package/addingFiles/template/makefile/makefile_shared_template
index 43fa79a..64bb63d 100644 (file)
--- a/package/addingFiles/template/makefile/makefile_shared_template
+++ b/package/addingFiles/template/makefile/makefile_shared_template
@@ -33,14 +33,13 @@ src \
 
 # -include src/subdir.mk
 # Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-$(CLI_SRC)
+CPP_SRCS += $(wildcard ../src/*.cpp)
 
-OBJS += \
-$(CLI_OBJ)
+TMP_FILES += $(patsubst ../src/%, ./src/%, $(CPP_SRCS))
 
-CPP_DEPS += \
-$(CLI_DEPS)
+OBJS += $(TMP_FILES:.cpp=.o)
+
+CPP_DEPS += $(TMP_FILES:.cpp=.d)
 
 
 # Each subdirectory must supply rules for building sources it contributes

diff --git a/package/addingFiles/template/makefile/makefile_static_template b/package/addingFiles/template/makefile/makefile_static_template
index bbde3e8..a3476de 100644 (file)
--- a/package/addingFiles/template/makefile/makefile_static_template
+++ b/package/addingFiles/template/makefile/makefile_static_template
@@ -33,14 +33,13 @@ src \
 
 # -include src/subdir.mk
 # Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-$(CLI_SRC)
+CPP_SRCS += $(wildcard ../src/*.cpp)
 
-OBJS += \
-$(CLI_OBJ)
+TMP_FILES += $(patsubst ../src/%, ./src/%, $(CPP_SRCS))
 
-CPP_DEPS += \
-$(CLI_DEPS)
+OBJS += $(TMP_FILES:.cpp=.o)
+
+CPP_DEPS += $(TMP_FILES:.cpp=.d)
 
 
 # Each subdirectory must supply rules for building sources it contributes