@@ -174,22 +174,30 @@ $(IOTC_GTEST_OBJDIR)/%.o : $(LIBIOTC_SRC)/%.cc $(IOTC_BUILD_PRECONDITIONS)
174
174
$(IOTC_OBJDIR ) /tests/tools/iotc_libiotc_driver/% .o : $(LIBIOTC ) /src/tests/tools/iotc_libiotc_driver/% .c $(IOTC_BUILD_PRECONDITIONS )
175
175
@-mkdir -p $(dir $@ )
176
176
$(info [$(CC ) ] $@ )
177
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) $(IOTC_TEST_TOOLS_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
178
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) $(IOTC_TEST_TOOLS_INCLUDE_FLAGS ) -MM $< -MT $@ -MF $(@:.o=.d )
177
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) $(IOTC_TEST_TOOLS_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
178
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) $(IOTC_TEST_TOOLS_INCLUDE_FLAGS ) -MM $< -MT $@ -MF $(@:.o=.d )
179
179
180
180
-include $(IOTC_OBJS :.o=.d)
181
181
182
+ # C source files
182
183
$(IOTC_OBJDIR ) /% .o : $(LIBIOTC ) /src/% .c $(IOTC_BUILD_PRECONDITIONS )
183
184
@-mkdir -p $(dir $@ )
184
185
$(info [$(CC ) ] $@ )
185
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
186
- $(IOTC_POST_COMPILE_ACTION )
186
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
187
+ $(IOTC_POST_COMPILE_ACTION_CC )
187
188
188
189
$(IOTC_OBJDIR ) /third_party/% .o : $(LIBIOTC ) /third_party/% .c $(IOTC_BUILD_PRECONDITIONS )
189
190
@-mkdir -p $(dir $@ )
190
191
$(info [$(CC ) ] $@ )
191
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
192
- $(IOTC_POST_COMPILE_ACTION )
192
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $(IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
193
+ $(IOTC_POST_COMPILE_ACTION_CC )
194
+
195
+ # C++ source files
196
+ $(IOTC_OBJDIR ) /% .o : $(LIBIOTC ) /src/% .cc $(IOTC_BUILD_PRECONDITIONS )
197
+ @-mkdir -p $(dir $@ )
198
+ $(info [$(CXX ) ] $@ )
199
+ $(MD ) $(CXX ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $(IOTC_CXX_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -c $< $(IOTC_COMPILER_OUTPUT )
200
+ $(IOTC_POST_COMPILE_ACTION_CXX )
193
201
194
202
# gather all of the binary directories
195
203
IOTC_RESOURCE_FILES := $(LIBIOTC ) /res/trusted_RootCA_certs/roots.pem
@@ -206,8 +214,8 @@ endif
206
214
$(IOTC_EXAMPLE_BINDIR ) /internal/% : $(XI )
207
215
$(info [$(CC ) ] $@ )
208
216
@-mkdir -p $(IOTC_EXAMPLE_OBJDIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) /,,$(dir $@ ) )
209
- $(MD ) $(CC ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -L$(IOTC_BINDIR ) $(XI ) $(LIBIOTC ) /examples/common/src/commandline.c $(IOTC_EXAMPLE_DIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) ,,$@ ) .c $(IOTC_LIB_FLAGS ) $(IOTC_COMPILER_OUTPUT )
210
- $(MD ) $(CC ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -MM $(IOTC_EXAMPLE_DIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) ,,$@ ) .c -MT $@ -MF $(IOTC_EXAMPLE_OBJDIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) /,,$@ ) .d
217
+ $(MD ) $(CC ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -L$(IOTC_BINDIR ) $(XI ) $(LIBIOTC ) /examples/common/src/commandline.c $(IOTC_EXAMPLE_DIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) ,,$@ ) .c $(IOTC_LIB_FLAGS ) $(IOTC_COMPILER_OUTPUT )
218
+ $(MD ) $(CC ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -MM $(IOTC_EXAMPLE_DIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) ,,$@ ) .c -MT $@ -MF $(IOTC_EXAMPLE_OBJDIR ) /$(subst $(IOTC_EXAMPLE_BINDIR ) /,,$@ ) .d
211
219
212
220
# ##
213
221
# ### TEST TOOLS
@@ -216,9 +224,9 @@ $(IOTC_EXAMPLE_BINDIR)/internal/%: $(XI)
216
224
217
225
$(IOTC_TEST_TOOLS_BINDIR ) /% : $(XI ) $(IOTC_TEST_TOOLS_OBJS )
218
226
$(info [$(CC ) ] $@ )
219
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -L$(IOTC_BINDIR ) $(IOTC_TEST_TOOLS_OBJS ) $(IOTC_TEST_TOOLS_SRCDIR ) /$(notdir $@ ) /$(notdir $@ ) .c $(IOTC_LIB_FLAGS ) $(IOTC_COMPILER_OUTPUT )
227
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -L$(IOTC_BINDIR ) $(IOTC_TEST_TOOLS_OBJS ) $(IOTC_TEST_TOOLS_SRCDIR ) /$(notdir $@ ) /$(notdir $@ ) .c $(IOTC_LIB_FLAGS ) $(IOTC_COMPILER_OUTPUT )
220
228
@-mkdir -p $(IOTC_TEST_TOOLS_OBJDIR )
221
- $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -MM $(IOTC_TEST_TOOLS_SRCDIR ) /$(notdir $@ ) /$(notdir $@ ) .c -MT $@ -MF $(IOTC_TEST_TOOLS_OBJDIR ) /$(notdir $@ ) .d
229
+ $(MD ) $(CC ) $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS ) -MM $(IOTC_TEST_TOOLS_SRCDIR ) /$(notdir $@ ) /$(notdir $@ ) .c -MT $@ -MF $(IOTC_TEST_TOOLS_OBJDIR ) /$(notdir $@ ) .d
222
230
@# $@
223
231
224
232
# ##
@@ -270,7 +278,7 @@ NOW:=$(shell date +"%F-%T")
270
278
271
279
$(LIBIOTC ) /src/% .sa :
272
280
$(info [clang-tidy] $(@:.sa=.c ) )
273
- @clang-tidy --checks=' clang-analyzer-*,-clang-analyzer-cplusplus*,-clang-analyzer-osx*' $(@:.sa=.c ) >> static_analysis_$(NOW ) .log -- $(IOTC_CONFIG_FLAGS ) $(IOTC_COMPILER_FLAGS ) $(IOTC_INCLUDE_FLAGS )
281
+ @clang-tidy --checks=' clang-analyzer-*,-clang-analyzer-cplusplus*,-clang-analyzer-osx*' $(@:.sa=.c ) >> static_analysis_$(NOW ) .log -- $(IOTC_CONFIG_FLAGS ) $(IOTC_COMMON_COMPILER_FLAGS ) $( IOTC_C_FLAGS ) $(IOTC_INCLUDE_FLAGS )
274
282
275
283
$(IOTC_BIN_DIRS ) :
276
284
@mkdir -p $@
0 commit comments