diff options
| author | px4dev <px4@purgatory.org> | 2013-05-12 10:51:25 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-05-12 10:51:25 -0700 |
| commit | 0ee738e9c91c49739798ac5ff8dd4a12c06bb82f (patch) | |
| tree | 46f6622613f4f002d53d56b0ff884b7922b48ec0 /makefiles | |
| parent | 555d42e0cd2724225391bede58629d3bcea175db (diff) | |
| download | px4-firmware-0ee738e9c91c49739798ac5ff8dd4a12c06bb82f.tar.gz px4-firmware-0ee738e9c91c49739798ac5ff8dd4a12c06bb82f.tar.bz2 px4-firmware-0ee738e9c91c49739798ac5ff8dd4a12c06bb82f.zip | |
Fix ROMFS dependency scan, add a warning if ROMFS_ROOT appears to be empty.
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/firmware.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index e6a45a4e8..6fa0ae3eb 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -269,13 +269,17 @@ endif # # Add dependencies on anything in the ROMFS root -ROMFS_DEPS += $(wildcard \ - (ROMFS_ROOT)/* \ - (ROMFS_ROOT)/*/* \ - (ROMFS_ROOT)/*/*/* \ - (ROMFS_ROOT)/*/*/*/* \ - (ROMFS_ROOT)/*/*/*/*/* \ - (ROMFS_ROOT)/*/*/*/*/*/*) +ROMFS_FILES += $(wildcard \ + $(ROMFS_ROOT)/* \ + $(ROMFS_ROOT)/*/* \ + $(ROMFS_ROOT)/*/*/* \ + $(ROMFS_ROOT)/*/*/*/* \ + $(ROMFS_ROOT)/*/*/*/*/* \ + $(ROMFS_ROOT)/*/*/*/*/*/*) +ifeq ($(ROMFS_FILES),) +$(error ROMFS_ROOT $(ROMFS_ROOT) specifies a directory containing no files) +endif +ROMFS_DEPS += $(ROMFS_FILES) ROMFS_IMG = $(WORK_DIR)romfs.img ROMFS_CSRC = $(ROMFS_IMG:.img=.c) ROMFS_OBJ = $(ROMFS_CSRC:.c=.o) |