Skip to content

Commit bc66a76

Browse files
dgarskedgarske
committed
Support for ThreadX
1 parent b8024ea commit bc66a76

File tree

6 files changed

+352
-74
lines changed

6 files changed

+352
-74
lines changed

‎Makefile‎

Lines changed: 88 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
2020

2121
SHELL := bash
22-
2322
AWK := awk
2423

24+
Q?=@
2525
ifeq "$(V)" "1"
2626
override undefine VERY_QUIET
27+
Q=
2728
endif
2829

2930
THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
@@ -34,10 +35,17 @@ endif
3435

3536
SRCS := wolfsentry_util.c wolfsentry_internal.c addr_families.c routes.c events.c actions.c kv.c action_builtins.c
3637

37-
ifndef SRC_TOP
38-
SRC_TOP := $(shell pwd -P)
38+
# Set PWD command based on OS - Windows uses 'pwd', others use 'pwd -P'
39+
ifeq ($(OS),Windows_NT)
40+
PWD := pwd
41+
SRC_TOP := .
3942
else
40-
SRC_TOP := $(shell cd $(SRC_TOP) && pwd -P)
43+
PWD := pwd -P
44+
ifndef SRC_TOP
45+
SRC_TOP := $(shell $(PWD))
46+
else
47+
SRC_TOP := $(shell cd $(SRC_TOP) && $(PWD))
48+
endif
4149
endif
4250

4351
ifndef BUILD_TOP
@@ -93,6 +101,17 @@ ifdef RUNTIME
93101
ifndef LWIP
94102
LWIP := 1
95103
endif
104+
else ifeq "$(RUNTIME)" "ThreadX-NetXDuo"
105+
ifndef THREADX_TOP
106+
$(error THREADX_TOP not supplied with RUNTIME=$(RUNTIME))
107+
endif
108+
ifndef NETXDUO
109+
NETXDUO := 1
110+
endif
111+
RUNTIME_CFLAGS += -DTHREADX -I$(THREADX_TOP)
112+
ifdef NEED_THREADX_TYPES
113+
RUNTIME_CFLAGS += -DNEED_THREADX_TYPES -I$(THREADX_TYPES_TOP)
114+
endif
96115
else
97116
$(error unrecognized runtime "$(RUNTIME)")
98117
endif
@@ -110,7 +129,7 @@ ifdef LWIP
110129
SRCS += lwip/packet_filter_glue.c
111130
endif
112131

113-
CC_V := $(shell $(CC) -v 2>&1 | sed "s/'/'\\\\''/g")
132+
CC_V := $(shell $(CC) -v 2>&1 | sed "s/'/'\\\\''/g; s/\`/'\\\\''/g;")
114133

115134
CC_IS_GCC := $(shell if [[ '$(CC_V)' =~ 'gcc version' ]]; then echo 1; else echo 0; fi)
116135

@@ -126,17 +145,18 @@ ifndef CLANG
126145
CLANG := clang
127146
endif
128147

129-
AS_VERSION := $(shell $(AS) --version 2>&1 | sed "s/'/'\\\\''/g")
130-
LD_VERSION := $(shell $(LD) --version 2>&1 | sed "s/'/'\\\\''/g")
131-
AR_VERSION := $(shell $(AR) --version 2>&1 | sed "s/'/'\\\\''/g")
148+
AS_VERSION := $(shell $(AS) --version 2>&1 | sed "s/'/'\\\\''/g; s/\`/'\\\\''/g;")
149+
LD_VERSION := $(shell $(LD) --version 2>&1 | sed "s/'/'\\\\''/g; s/\`/'\\\\''/g;")
150+
AR_VERSION := $(shell $(AR) --version 2>&1 | sed "s/'/'\\\\''/g; s/\`/'\\\\''/g;")
132151

133152
AR_IS_GNU_AR := $(shell if [[ '$(AR_VERSION)' =~ 'GNU' ]]; then echo 1; else echo 0; fi)
134153

135154
ifndef C_WARNFLAGS
136155
C_WARNFLAGS := -Wall -Wextra -Werror -Wformat=2 -Winit-self -Wmissing-include-dirs -Wunknown-pragmas -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wmissing-format-attribute -Wpointer-arith -Woverlength-strings -Wredundant-decls -Winline -Winvalid-pch -Wdouble-promotion -Wvla -Wno-type-limits -Wdeclaration-after-statement -Wnested-externs
137156
ifeq "$(CC_IS_GCC)" "1"
138157
MAYBE_WARN_PACKED_NOT_ALIGNED := $(shell $(CC) -E -Wpacked-not-aligned -x c /dev/null >/dev/null 2>&1 && echo -Wpacked-not-aligned)
139-
C_WARNFLAGS += -Wjump-misses-init -Wlogical-op -Wlogical-not-parentheses $(MAYBE_WARN_PACKED_NOT_ALIGNED)
158+
C_WARNFLAGS += -Wjump-misses-init -Wlogical-op $(MAYBE_WARN_PACKED_NOT_ALIGNED)
159+
#-Wlogical-not-parentheses
140160
endif
141161
endif
142162

@@ -178,7 +198,7 @@ else
178198
ifdef NO_JSON_DOM
179199
CFLAGS += -DWOLFSENTRY_NO_JSON_DOM
180200
else ifdef USER_SETTINGS_NO_JSON_DOM
181-
NO_JSON_DOM := 1
201+
NO_JSON_DOM := 1
182202
else
183203
SRCS += json/centijson_dom.c json/centijson_value.c
184204
endif
@@ -191,7 +211,9 @@ endif
191211
ifdef SINGLETHREADED
192212
CFLAGS += -DWOLFSENTRY_SINGLETHREADED
193213
else
194-
ifneq "$(RUNTIME)" "FreeRTOS-lwIP"
214+
ifeq "$(RUNTIME)" "ThreadX-NetXDuo"
215+
else ifeq "$(RUNTIME)" "FreeRTOS-lwIP"
216+
else
195217
LDFLAGS += -pthread
196218
endif
197219
endif
@@ -252,42 +274,42 @@ BUILD_PARAMS := (echo 'CC_V:'; echo '$(CC_V)'; echo 'SRC_TOP: $(SRC_TOP)'; echo
252274

253275
.PHONY: force
254276
$(BUILD_TOP)/.build_params: force
255-
@cd $(SRC_TOP) && [ -d .git ] || exit 0 && ([ -d .git/hooks ] || mkdir .git/hooks) && ([ -e .git/hooks/pre-push ] || ln -s ../../scripts/pre-push.sh .git/hooks/pre-push 2>/dev/null || exit 0)
256-
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
277+
$(Q)cd $(SRC_TOP) && [ -d .git ] || exit 0 && ([ -d .git/hooks ] || mkdir .git/hooks) && ([ -e .git/hooks/pre-push ] || ln -s ../../scripts/pre-push.sh .git/hooks/pre-push 2>/dev/null || exit 0)
278+
$(Q)[ -d $(dir $@) ] || mkdir -p $(dir $@)
257279
ifdef VERY_QUIET
258-
@{ $(BUILD_PARAMS) | cmp -s - $@; } 2>/dev/null; cmp_ev=$$?; if [ $$cmp_ev != 0 ]; then $(BUILD_PARAMS) > $@; fi; exit 0
280+
$(Q){ $(BUILD_PARAMS) | cmp -s - $@; } 2>/dev/null; cmp_ev=$$?; if [ $$cmp_ev != 0 ]; then $(BUILD_PARAMS) > $@; fi; exit 0
259281
else
260-
@{ $(BUILD_PARAMS) | cmp -s - $@; } 2>/dev/null; cmp_ev=$$?; if [ $$cmp_ev = 0 ]; then echo 'Build parameters unchanged.'; else $(BUILD_PARAMS) > $@; if [ $$cmp_ev = 1 ]; then echo 'Rebuilding with changed build parameters.'; else echo 'Building fresh.'; fi; fi; exit 0
282+
$(Q){ $(BUILD_PARAMS) | cmp -s - $@; } 2>/dev/null; cmp_ev=$$?; if [ $$cmp_ev = 0 ]; then echo 'Build parameters unchanged.'; else $(BUILD_PARAMS) > $@; if [ $$cmp_ev = 1 ]; then echo 'Rebuilding with changed build parameters.'; else echo 'Building fresh.'; fi; fi; exit 0
261283
endif
262284

263285
ifndef USER_SETTINGS_FILE
264286
$(BUILD_TOP)/wolfsentry/wolfsentry_options.h: $(SRC_TOP)/scripts/build_wolfsentry_options_h.awk $(BUILD_TOP)/.build_params
265-
@[ -d $(BUILD_TOP)/wolfsentry ] || mkdir -p $(BUILD_TOP)/wolfsentry
266-
@echo '$(CFLAGS)' | $(AWK) -f $< > $@
287+
$(Q)[ -d $(BUILD_TOP)/wolfsentry ] || mkdir -p $(BUILD_TOP)/wolfsentry
288+
$(Q)echo '$(CFLAGS)' | $(AWK) -f $< > $@
267289
endif
268290

269291
$(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.o)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.So)): $(BUILD_TOP)/.build_params $(OPTIONS_FILE) $(SRC_TOP)/Makefile
270292

271293
INTERNAL_CFLAGS := -DBUILDING_LIBWOLFSENTRY -MMD
272294

273295
$(BUILD_TOP)/src/%.o: $(SRC_TOP)/src/%.c
274-
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
275-
@rm -f $(@:.o=.gcda)
296+
$(Q)[ -d $(dir $@) ] || mkdir -p $(dir $@)
297+
$(Q)rm -f $(@:.o=.gcda)
276298
ifeq "$(V)" "1"
277299
$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.o=.d) -c $< -o $@
278300
else
279301
ifndef VERY_QUIET
280-
@echo "$(CC) ... -o $@"
302+
$(Q)echo "$(CC) ... -o $@"
281303
endif
282-
@$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.o=.d) -c $< -o $@
304+
$(Q)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.o=.d) -c $< -o $@
283305
endif
284306

285307
$(BUILD_TOP)/$(LIB_NAME): $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.o))
286308
ifdef VERY_QUIET
287-
@rm -f $@
288-
@$(AR) $(AR_FLAGS) $@ $+
309+
$(Q)rm -f $@
310+
$(Q)$(AR) $(AR_FLAGS) $@ $+
289311
else
290-
@rm -f $@
312+
$(Q)rm -f $@
291313
$(AR) $(AR_FLAGS) $@ $+
292314
endif
293315

@@ -296,20 +318,20 @@ endif
296318
$(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.So)): $(BUILD_TOP)/.build_params $(SRC_TOP)/Makefile
297319

298320
$(BUILD_TOP)/src/%.So: $(SRC_TOP)/src/%.c
299-
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
300-
@rm -f $(@:.So=.gcda)
321+
$(Q)[ -d $(dir $@) ] || mkdir -p $(dir $@)
322+
$(Q)rm -f $(@:.So=.gcda)
301323
ifeq "$(V)" "1"
302324
$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(DYNAMIC_CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.So=.Sd) -c $< -o $@
303325
else
304326
ifndef VERY_QUIET
305-
@echo "$(CC) ... -o $@"
327+
$(Q)echo "$(CC) ... -o $@"
306328
endif
307-
@$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(DYNAMIC_CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.So=.Sd) -c $< -o $@
329+
$(Q)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) $(DYNAMIC_CFLAGS) $(VISIBILITY_CFLAGS) -MF $(@:.So=.Sd) -c $< -o $@
308330
endif
309331

310332
$(BUILD_TOP)/$(DYNLIB_NAME): $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.So))
311333
ifdef VERY_QUIET
312-
@$(CC) $(LD_FLAGS) $(DYNAMIC_LDFLAGS) -o $@ $+
334+
$(Q)$(CC) $(LD_FLAGS) $(DYNAMIC_LDFLAGS) -o $@ $+
313335
else
314336
$(CC) $(LD_FLAGS) $(DYNAMIC_LDFLAGS) -o $@ $+
315337
endif
@@ -329,29 +351,29 @@ endif
329351

330352
$(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST)): UNITTEST_GATE=-D$(shell basename '$@' | tr '[:lower:]' '[:upper:]')
331353
$(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST)): $(SRC_TOP)/tests/unittests.c $(BUILD_TOP)/$(LIB_NAME) $(OPTIONS_FILE)
332-
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
354+
$(Q)[ -d $(dir $@) ] || mkdir -p $(dir $@)
333355
ifeq "$(V)" "1"
334356
$(CC) $(CFLAGS) $(UNITTEST_GATE) $(LDFLAGS) -o $@ $(filter-out %.h,$^)
335357
else
336358
ifndef VERY_QUIET
337-
@echo "$(CC) ... -o $@"
359+
$(Q)echo "$(CC) ... -o $@"
338360
endif
339-
@$(CC) $(CFLAGS) $(UNITTEST_GATE) $(LDFLAGS) -o $@ $(filter-out %.h,$^)
361+
$(Q)$(CC) $(CFLAGS) $(UNITTEST_GATE) $(LDFLAGS) -o $@ $(filter-out %.h,$^)
340362
endif
341363

342364

343365
UNITTEST_LIST_SHARED=test_all_shared
344366
UNITTEST_SHARED_FLAGS := $(addprefix -D,$(shell echo '$(UNITTEST_LIST)' | tr '[:lower:]' '[:upper:]')) $(TEST_JSON_CFLAGS)
345367

346368
$(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST_SHARED)): $(SRC_TOP)/tests/unittests.c $(BUILD_TOP)/$(DYNLIB_NAME) $(OPTIONS_FILE)
347-
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
369+
$(Q)[ -d $(dir $@) ] || mkdir -p $(dir $@)
348370
ifeq "$(V)" "1"
349371
$(CC) $(CFLAGS) $(UNITTEST_SHARED_FLAGS) $(LDFLAGS) -o $@ $< $(BUILD_TOP)/$(DYNLIB_NAME)
350372
else
351373
ifndef VERY_QUIET
352-
@echo "$(CC) ... -o $@"
374+
$(Q)echo "$(CC) ... -o $@"
353375
endif
354-
@$(CC) $(CFLAGS) $(UNITTEST_SHARED_FLAGS) $(LDFLAGS) -o $@ $< $(BUILD_TOP)/$(DYNLIB_NAME)
376+
$(Q)$(CC) $(CFLAGS) $(UNITTEST_SHARED_FLAGS) $(LDFLAGS) -o $@ $< $(BUILD_TOP)/$(DYNLIB_NAME)
355377
endif
356378

357379
ifdef BUILD_DYNAMIC
@@ -364,26 +386,26 @@ test: $(BUILD_TOP)/.tested
364386

365387
$(BUILD_TOP)/.tested: $(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST))
366388
ifdef VERY_QUIET
367-
@for test in $(basename $(UNITTEST_LIST)); do $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null; exitcode=$$?; if [ $$exitcode != 0 ]; then echo "$${test} failed" 1>&2; break; fi; done; exit $$exitcode
389+
$(Q)for test in $(basename $(UNITTEST_LIST)); do $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null; exitcode=$$?; if [ $$exitcode != 0 ]; then echo "$${test} failed" 1>&2; break; fi; done; exit $$exitcode
368390
else
369391
ifeq "$(V)" "1"
370-
@for test in $(basename $(UNITTEST_LIST)); do echo "$${test}:"; echo $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test"; $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test"; exitcode=$$?; if [ $$exitcode != 0 ]; then break; fi; echo "$${test} succeeded"; echo; done; if [ "$$exitcode" = 0 ]; then echo 'all subtests succeeded.'; else exit $$exitcode; fi
392+
$(Q)for test in $(basename $(UNITTEST_LIST)); do echo "$${test}:"; echo $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test"; $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test"; exitcode=$$?; if [ $$exitcode != 0 ]; then break; fi; echo "$${test} succeeded"; echo; done; if [ "$$exitcode" = 0 ]; then echo 'all subtests succeeded.'; else exit $$exitcode; fi
371393
else
372-
@for test in $(basename $(UNITTEST_LIST)); do echo -n "$${test}..."; $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null; exitcode=$$?; if [ $$exitcode != 0 ]; then break; fi; echo ' succeeded'; done; if [ "$$exitcode" = 0 ]; then echo 'all subtests succeeded.'; else exit $$exitcode; fi
394+
$(Q)for test in $(basename $(UNITTEST_LIST)); do echo -n "$${test}..."; $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null; exitcode=$$?; if [ $$exitcode != 0 ]; then break; fi; echo ' succeeded'; done; if [ "$$exitcode" = 0 ]; then echo 'all subtests succeeded.'; else exit $$exitcode; fi
373395
endif
374396
endif
375397
ifdef BUILD_DYNAMIC
376-
@for test in $(UNITTEST_LIST_SHARED); do LD_LIBRARY_PATH=$(BUILD_TOP) $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null || exit $?; done
398+
$(Q)for test in $(UNITTEST_LIST_SHARED); do LD_LIBRARY_PATH=$(BUILD_TOP) $(TEST_ENV) $(EXE_LAUNCHER) "$(BUILD_TOP)/tests/$$test" >/dev/null || exit $?; done
377399
ifndef VERY_QUIET
378-
@echo '$(UNITTEST_LIST_SHARED) succeeded.'
400+
$(Q)echo '$(UNITTEST_LIST_SHARED) succeeded.'
379401
endif
380402
endif
381-
@touch $(BUILD_TOP)/.tested
403+
$(Q)touch $(BUILD_TOP)/.tested
382404

383405
.PHONY: retest
384406
retest:
385-
@$(RM) -f $(BUILD_TOP)/.tested
386-
@$(MAKE) -f $(THIS_MAKEFILE) test
407+
$(Q)$(RM) -f $(BUILD_TOP)/.tested
408+
$(Q)$(MAKE) -f $(THIS_MAKEFILE) test
387409

388410
ifndef INSTALL_DIR
389411
INSTALL_DIR := /usr/local
@@ -404,9 +426,9 @@ install: $(BUILD_TOP)/.tested
404426
install-untested: all
405427

406428
install install-untested:
407-
@mkdir -p $(INSTALL_LIBDIR)
429+
$(Q)mkdir -p $(INSTALL_LIBDIR)
408430
install -p -m 0644 $(INSTALL_LIBS) $(INSTALL_LIBDIR)
409-
@mkdir -p $(INSTALL_INCDIR)/wolfsentry
431+
$(Q)mkdir -p $(INSTALL_INCDIR)/wolfsentry
410432
install -p -m 0644 $(INSTALL_HEADERS) $(INSTALL_INCDIR)/wolfsentry
411433

412434
.PHONY: uninstall
@@ -431,11 +453,11 @@ endif
431453

432454
.PHONY: dist
433455
dist:
434-
@if [[ ! -d "$(SRC_TOP)/.git" ]]; then echo 'dist target requires git artifacts.' 1>&2; exit 1; fi
456+
$(Q)if [[ ! -d "$(SRC_TOP)/.git" ]]; then echo 'dist target requires git artifacts.' 1>&2; exit 1; fi
435457
ifndef VERY_QUIET
436-
@echo "generating dist archive wolfsentry-$(VERSION).tgz"
458+
$(Q)echo "generating dist archive wolfsentry-$(VERSION).tgz"
437459
endif
438-
@DEST_DIR="$$PWD"; \
460+
$(Q)DEST_DIR="$$PWD"; \
439461
cd $(SRC_TOP); \
440462
if [[ "$(VERSION)" =~ -dirty$$ ]]; then \
441463
if [[ -n "$$(git ls-files -d)" ]]; then \
@@ -449,17 +471,17 @@ endif
449471
fi
450472

451473
dist-test: dist
452-
@rm -rf $(BUILD_TOP)/dist-test
453-
@mkdir -p $(BUILD_TOP)/dist-test
474+
$(Q)rm -rf $(BUILD_TOP)/dist-test
475+
$(Q)mkdir -p $(BUILD_TOP)/dist-test
454476
ifdef VERY_QUIET
455-
@DEST_DIR="$$PWD" && cd $(BUILD_TOP)/dist-test && $(TAR) -xf "$${DEST_DIR}/wolfsentry-$(VERSION).tgz" && cd wolfsentry-$(VERSION) && $(MAKE) --quiet test
477+
$(Q)DEST_DIR="$$PWD" && cd $(BUILD_TOP)/dist-test && $(TAR) -xf "$${DEST_DIR}/wolfsentry-$(VERSION).tgz" && cd wolfsentry-$(VERSION) && $(MAKE) --quiet test
456478
else
457-
@DEST_DIR="$$PWD" && cd $(BUILD_TOP)/dist-test && $(TAR) -xf "$${DEST_DIR}/wolfsentry-$(VERSION).tgz" && cd wolfsentry-$(VERSION) && $(MAKE) test
479+
$(Q)DEST_DIR="$$PWD" && cd $(BUILD_TOP)/dist-test && $(TAR) -xf "$${DEST_DIR}/wolfsentry-$(VERSION).tgz" && cd wolfsentry-$(VERSION) && $(MAKE) test
458480
endif
459481

460482
dist-test-clean:
461-
@DEST_DIR="$$PWD" && [ -d $(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) ] && [ -f $${DEST_DIR}/wolfsentry-$(VERSION).tgz ] && cd $(BUILD_TOP)/dist-test && $(TAR) -tf $${DEST_DIR}/wolfsentry-$(VERSION).tgz | grep -E -v '/$$' | xargs $(RM) -f
462-
@[ -d $(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) ] && $(MAKE) $(EXTRA_MAKE_FLAGS) -f $(THIS_MAKEFILE) BUILD_TOP=$(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) clean && rmdir $(BUILD_TOP)/dist-test
483+
$(Q)DEST_DIR="$$PWD" && [ -d $(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) ] && [ -f $${DEST_DIR}/wolfsentry-$(VERSION).tgz ] && cd $(BUILD_TOP)/dist-test && $(TAR) -tf $${DEST_DIR}/wolfsentry-$(VERSION).tgz | grep -E -v '/$$' | xargs $(RM) -f
484+
$(Q)[ -d $(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) ] && $(MAKE) $(EXTRA_MAKE_FLAGS) -f $(THIS_MAKEFILE) BUILD_TOP=$(BUILD_TOP)/dist-test/wolfsentry-$(VERSION) clean && rmdir $(BUILD_TOP)/dist-test
463485

464486
CLEAN_RM_ARGS = -f $(BUILD_TOP)/.build_params $(BUILD_TOP)/wolfsentry/wolfsentry_options.h $(BUILD_TOP)/.tested $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.o)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.So)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.d)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.Sd)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.gcno)) $(addprefix $(BUILD_TOP)/src/,$(SRCS:.c=.gcda)) $(BUILD_TOP)/$(LIB_NAME) $(BUILD_TOP)/$(DYNLIB_NAME) $(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST)) $(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST_SHARED)) $(addprefix $(BUILD_TOP)/tests/,$(addsuffix .d,$(UNITTEST_LIST))) $(addprefix $(BUILD_TOP)/tests/,$(addsuffix .d,$(UNITTEST_LIST_SHARED))) $(ANALYZER_BUILD_ARTIFACTS)
465487

@@ -473,8 +495,8 @@ README_FOR_FULL_MANUAL_RECIPE = grep -v -E -e 'doc/[-_[:alnum:]]+\.md|ChangeLog\
473495

474496
.PHONY: doc-html
475497
doc-html:
476-
@command -v doxygen >/dev/null || doxygen
477-
@mkdir -p '$(BUILD_TOP)/doc' && \
498+
$(Q)command -v doxygen >/dev/null || doxygen
499+
$(Q)mkdir -p '$(BUILD_TOP)/doc' && \
478500
RELEASE_PER_HEADERS=$$($(PRINT_VERSION_RECIPE)) && \
479501
cd '$(BUILD_TOP)/doc' && \
480502
rm -rf html && \
@@ -491,13 +513,13 @@ doc-html:
491513

492514
.PHONY: doc-html-clean
493515
doc-html-clean:
494-
@rm -rf '$(BUILD_TOP)/doc/html'
516+
$(Q)rm -rf '$(BUILD_TOP)/doc/html'
495517

496518
$(BUILD_TOP)/doc/pdf/refman.pdf: $(addprefix $(SRC_TOP)/, $(filter-out %/wolfsentry_options.h,$(INSTALL_HEADERS)) ChangeLog.md README.md doc/freertos-lwip-app.md doc/json_configuration.md)
497-
@command -v doxygen >/dev/null || doxygen
498-
@command -v pdflatex >/dev/null || pdflatex
499-
@command -v makeindex >/dev/null || makeindex
500-
@mkdir -p '$(BUILD_TOP)/doc' && \
519+
$(Q)command -v doxygen >/dev/null || doxygen
520+
$(Q)command -v pdflatex >/dev/null || pdflatex
521+
$(Q)command -v makeindex >/dev/null || makeindex
522+
$(Q)mkdir -p '$(BUILD_TOP)/doc' && \
501523
RELEASE_PER_HEADERS=$$($(PRINT_VERSION_RECIPE)) && \
502524
cd '$(BUILD_TOP)/doc' && \
503525
rm -rf pdf && \
@@ -521,7 +543,7 @@ doc-pdf: $(BUILD_TOP)/doc/pdf/refman.pdf
521543

522544
.PHONY: doc-pdf-clean
523545
doc-pdf-clean:
524-
@rm -rf '$(BUILD_TOP)/doc/pdf'
546+
$(Q)rm -rf '$(BUILD_TOP)/doc/pdf'
525547

526548
doc: doc-html $(BUILD_TOP)/doc/pdf/refman.pdf
527549

@@ -532,12 +554,12 @@ clean:
532554
ifeq "$(V)" "1"
533555
rm $(CLEAN_RM_ARGS)
534556
else
535-
@rm $(CLEAN_RM_ARGS)
557+
$(Q)rm $(CLEAN_RM_ARGS)
536558
endif
537-
@rm -rf $(addsuffix .dSYM,$(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST) $(UNITTEST_LIST_SHARED)))
538-
@[[ -d "$(BUILD_TOP)/wolfsentry" && ! "$(BUILD_TOP)" -ef "$(SRC_TOP)" ]] && find $(BUILD_TOP)/{src,tests,ports,lwip,wolfsentry,examples,scripts,FreeRTOS,.github,doc} -depth -type d -print0 2>/dev/null | xargs -0 rmdir && rmdir "${BUILD_TOP}" || exit 0
559+
$(Q)rm -rf $(addsuffix .dSYM,$(addprefix $(BUILD_TOP)/tests/,$(UNITTEST_LIST) $(UNITTEST_LIST_SHARED)))
560+
$(Q)[[ -d "$(BUILD_TOP)/wolfsentry" && ! "$(BUILD_TOP)" -ef "$(SRC_TOP)" ]] && find $(BUILD_TOP)/{src,tests,ports,lwip,wolfsentry,examples,scripts,FreeRTOS,.github,doc} -depth -type d -print0 2>/dev/null | xargs -0 rmdir && rmdir "${BUILD_TOP}" || exit 0
539561
ifndef VERY_QUIET
540-
@echo 'cleaned all targets and ephemera in $(BUILD_TOP)'
562+
$(Q)echo 'cleaned all targets and ephemera in $(BUILD_TOP)'
541563
endif
542564

543565
-include $(SRC_TOP)/Makefile.analyzers

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ topic.
115115
| `DEBUG` | | Compiler debugging flag to use (default `-ggdb`) |
116116
| `OPTIM` | | The optimizer flag to use (default `-O3`) |
117117
| `HOST` | | The target host tuple, for cross-compilation (default unset, i.e. native targeting) |
118-
| `RUNTIME` | | The target runtime ecosystem -- default unset, `FreeRTOS-lwIP` and `Linux-lwIP` are recognized |
118+
| `RUNTIME` | | The target runtime ecosystem -- default unset, `FreeRTOS-lwIP`, `Linux-lwIP` and `ThreadX-NetXDuo` are recognized |
119119
| `C_WARNFLAGS` | | The warning flags to use (overriding the generally applicable defaults) |
120120
| `STATIC` | | Build statically linked unit tests |
121121
| `STRIPPED` | | Strip binaries of debugging symbols |

0 commit comments

Comments
 (0)