diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-01 09:28:49 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-01 09:28:49 +0200 |
| commit | 4f7e66bba246e4972ccfab188ee3a7d4e4af3c86 (patch) | |
| tree | ff0b4f429fdfb957a225539053ed7249bee5798d /makefiles/firmware.mk | |
| parent | 183a0cdb22fd824d87912ea3d2c2470f0d28ed39 (diff) | |
| parent | 8408993a676acd0149e880ffeded74ce9c67b9c5 (diff) | |
| download | px4-firmware-4f7e66bba246e4972ccfab188ee3a7d4e4af3c86.tar.gz px4-firmware-4f7e66bba246e4972ccfab188ee3a7d4e4af3c86.tar.bz2 px4-firmware-4f7e66bba246e4972ccfab188ee3a7d4e4af3c86.zip | |
Merged master in yaw_acceptance_fix
Diffstat (limited to 'makefiles/firmware.mk')
| -rw-r--r-- | makefiles/firmware.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 1b646d9e0..60602e76f 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -113,7 +113,7 @@ endif $(info % GIT_DESC = $(GIT_DESC)) # -# Set a default target so that included makefiles or errors here don't +# Set a default target so that included makefiles or errors here don't # cause confusion. # # XXX We could do something cute here with $(DEFAULT_GOAL) if it's not one @@ -177,7 +177,7 @@ GLOBAL_DEPS += $(MAKEFILE_LIST) # # Extra things we should clean # -EXTRA_CLEANS = +EXTRA_CLEANS = # @@ -371,6 +371,8 @@ $(ROMFS_IMG): $(ROMFS_SCRATCH) $(ROMFS_DEPS) $(GLOBAL_DEPS) $(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH) $(Q) $(COPYDIR) $(ROMFS_ROOT)/* $(ROMFS_SCRATCH) +# delete all files in ROMFS_SCRATCH which start with a . or end with a ~ + $(Q) $(RM) $(ROMFS_SCRATCH)/*/.[!.]* $(ROMFS_SCRATCH)/*/*~ ifneq ($(ROMFS_EXTRA_FILES),) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras |