Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Cleaned up 'make *_clean', 'make *_flash'. (#8457)

Browse source 
Cleaned up 'make *_clean', 'make *_flash'.
This commit is contained in:
Michael Keller 2019-06-25 02:16:50 +12:00 • committed by GitHub
commit b248f6cde5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Makefile
View file

@ -413,7 +413,7 @@ unsupported: $(UNSUPPORTED_TARGETS)
## pre-push : The minimum verification that should be run before pushing, to check if CI has a chance of succeeding ## pre-push : The minimum verification that should be run before pushing, to check if CI has a chance of succeeding
pre-push: pre-push:
$(MAKE) $(addprefix clean_,$(PRE_PUSH_TARGET_LIST)) $(PRE_PUSH_TARGET_LIST) EXTRA_FLAGS=-Werror $(MAKE) $(addsuffix _clean,$(PRE_PUSH_TARGET_LIST)) $(PRE_PUSH_TARGET_LIST) EXTRA_FLAGS=-Werror
## official : Build all official (travis) targets ## official : Build all official (travis) targets
official: $(OFFICIAL_TARGETS) official: $(OFFICIAL_TARGETS)
@ -441,7 +441,6 @@ $(VALID_TARGETS):
$(NOBUILD_TARGETS): $(NOBUILD_TARGETS):
$(MAKE) TARGET=$@ $(MAKE) TARGET=$@
CLEAN_TARGETS = $(addprefix clean_,$(VALID_TARGETS) )
TARGETS_CLEAN = $(addsuffix _clean,$(VALID_TARGETS) ) TARGETS_CLEAN = $(addsuffix _clean,$(VALID_TARGETS) )
## clean : clean up temporary / machine-generated files ## clean : clean up temporary / machine-generated files
@ -451,37 +450,30 @@ clean:
$(V0) rm -rf $(OBJECT_DIR)/$(TARGET) $(V0) rm -rf $(OBJECT_DIR)/$(TARGET)
@echo "Cleaning $(TARGET) succeeded." @echo "Cleaning $(TARGET) succeeded."
## clean_test : clean up temporary / machine-generated files (tests) ## test_clean : clean up temporary / machine-generated files (tests)
clean_test-%: test-%_clean:
$(MAKE) clean_test $(MAKE) test_clean
clean_test: test_clean:
$(V0) cd src/test && $(MAKE) clean || true $(V0) cd src/test && $(MAKE) clean || true
## clean_<TARGET> : clean up one specific target
$(CLEAN_TARGETS):
$(V0) $(MAKE) -j TARGET=$(subst clean_,,$@) clean
## <TARGET>_clean : clean up one specific target (alias for above) ## <TARGET>_clean : clean up one specific target (alias for above)
$(TARGETS_CLEAN): $(TARGETS_CLEAN):
$(V0) $(MAKE) -j TARGET=$(subst _clean,,$@) clean $(V0) $(MAKE) -j TARGET=$(subst _clean,,$@) clean
## clean_all : clean all valid targets ## clean_all : clean all valid targets
clean_all: $(CLEAN_TARGETS) clean_all: $(TARGETS_CLEAN) test_clean
## all_clean : clean all valid targets (alias for above) TARGETS_FLASH = $(addsuffix _flash,$(VALID_TARGETS) )
all_clean: $(TARGETS_CLEAN)
FLASH_TARGETS = $(addprefix flash_,$(VALID_TARGETS) ) ## <TARGET>_flash : build and flash a target
$(TARGETS_FLASH):
## flash_<TARGET> : build and flash a target
$(FLASH_TARGETS):
ifneq (,$(findstring /dev/ttyUSB,$(SERIAL_DEVICE))) ifneq (,$(findstring /dev/ttyUSB,$(SERIAL_DEVICE)))
$(V0) $(MAKE) -j hex TARGET=$(subst flash_,,$@) $(V0) $(MAKE) -j hex TARGET=$(subst _flash,,$@)
$(V0) $(MAKE) tty_flash TARGET=$(subst flash_,,$@) $(V0) $(MAKE) tty_flash TARGET=$(subst _flash,,$@)
else else
$(V0) $(MAKE) -j binary TARGET=$(subst flash_,,$@) $(V0) $(MAKE) -j binary TARGET=$(subst _flash,,$@)
$(V0) $(MAKE) dfu_flash TARGET=$(subst flash_,,$@) $(V0) $(MAKE) dfu_flash TARGET=$(subst _flash,,$@)
endif endif
## tty_flash : flash firmware (.hex) onto flight controller via a serial port ## tty_flash : flash firmware (.hex) onto flight controller via a serial port