Build fix: make tags from app folders too

Author: 0x8000-0000

Makefile

@@ -73,9 +73,9 @@ $(1)_$(2)_OBJDIR:=$(MYPATH)obj.$(COMPILER)$(FLAVOR)
 $$($(1)_$(2)_OBJDIR):
 	mkdir -p $$($(1)_$(2)_OBJDIR)
 
-TARGETS+=$$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_TARGET).img $(MYPATH)/tags
+TARGETS+=$$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_TARGET).img $(MYPATH)tags
 
-DIR_TO_CLEAN+=$$($(1)_$(2)_OBJDIR) $(MYPATH)/tags $(MYPATH)/tagsinput
+DIR_TO_CLEAN+=$$($(1)_$(2)_OBJDIR) $(MYPATH)tags $(MYPATH)tagsinput
 
 $(1)_$(2)_OBJ_LIST:=$(APP_$(1)_OBJECTS) $(BOARD_$(2)_OBJECTS) $(FX3_OBJECTS) $(foreach comp,$(3),$(COMPONENT_$(comp)_OBJECTS))
 
@@ -106,11 +106,11 @@ $$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_TARGET).img: $$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_T
 	@echo IMG $$@
 	@$(OBJDUMP) $$< > $$@
 
-$(MYPATH)/tags: $$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_TARGET).elf
+$(MYPATH)tags: $$($(1)_$(2)_OBJDIR)/$$(APP_$(1)_TARGET).elf
 	@echo tags $(MYPATH)
 	@cat $$($(1)_$(2)_OBJDIR)/*.d | tr " " "\n" | grep ".h$$$$" | sort | uniq > $$($(1)_$(2)_OBJDIR)/headers.list
-	@python tools/build/make_relative_path.py $(MYPATH) $$($(1)_$(2)_OBJDIR)/sources.list $$($(1)_$(2)_OBJDIR)/headers.list > $(MYPATH)/tagsinput
-	@cd $(MYPATH) && ctags -L tagsinput
+	@python tools/build/make_relative_path.py $(MYPATH) $$($(1)_$(2)_OBJDIR)/sources.list $$($(1)_$(2)_OBJDIR)/headers.list > $(MYPATH)tagsinput
+	@cd $(MYPATH) && ctags -L tagsinput --c++-kinds=+p --fields=+iaS --extra=+q
 
 $$($(1)_$(2)_OBJDIR)/%.o: %.S | $$($(1)_$(2)_OBJDIR)
 ifeq ($(VERBOSE),true)

tools/build/common_target.mk

@@ -38,10 +38,15 @@ APP_FRAGMENTS:=$(wildcard ../../source/apps/*/app.mk)
 
 include $(APP_FRAGMENTS)
 
+local_artifacts: tags obj.$(COMPILER)$(FLAVOR)/$(APP_$(TARGET_APP)_TARGET).img
+
 obj.$(COMPILER)$(FLAVOR)/$(APP_$(TARGET_APP)_TARGET).img: force
 	@$(MAKE) --no-print-directory -C ../.. build/$(TARGET_DIR)/obj.$(COMPILER)$(FLAVOR)/$(APP_$(TARGET_APP)_TARGET).img
 
+tags: force
+	@$(MAKE) --no-print-directory -C ../.. build/$(TARGET_DIR)/tags
+
 clean:
 	@$(RM) -r obj.$(COMPILER)$(FLAVOR)
 
-.PHONY: clean force
+.PHONY: clean force local_artifacts