Skip to content

Commit 5af36f0

Browse files
committed
btrfs-progs: build: clean up tags files enumeration
There are 3 rules repeating the pattern for tags files but it gets out of sync, e.g. it lacks crypto/. To fix that generate the list in one place from one place. Signed-off-by: David Sterba <[email protected]>
1 parent 3924a1b commit 5af36f0

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@ tune_objects = tune/main.o tune/seeding.o tune/change-uuid.o tune/change-metadat
292292
all_objects = $(objects) $(cmds_objects) $(libbtrfs_objects) $(convert_objects) \
293293
$(mkfs_objects) $(image_objects) $(tune_objects) $(libbtrfsutil_objects)
294294

295+
tags_files = $(addsuffix /*.[ch], . check cmds common convert crypto image include mkfs tune \
296+
kernel-lib kernel-shared kernel-shared/uapi \
297+
libbtrfs libbtrfsutil libbtrfsutil/python tests)
298+
295299
udev_rules = 64-btrfs-dm.rules 64-btrfs-zoned.rules
296300

297301
ifeq ("$(origin V)", "command line")
@@ -893,25 +897,15 @@ compile_commands.json: FORCE
893897

894898
tags: FORCE
895899
@echo " TAGS $(TAGS_CMD)"
896-
$(Q)$(TAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] \
897-
check/*.[ch] kernel-lib/*.[ch] kernel-shared/*.[ch] \
898-
kernel-shared/*/*.[ch] \
899-
cmds/*.[ch] common/*.[ch] tune/*.[ch] \
900-
libbtrfsutil/*.[ch]
900+
$(Q)$(TAGS_CMD) $(tags_files)
901901

902902
etags: FORCE
903903
@echo " ETAGS $(ETAGS_CMD)"
904-
$(Q)$(ETAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] \
905-
check/*.[ch] kernel-lib/*.[ch] kernel-shared/*.[ch] \
906-
cmds/*.[ch] common/*.[ch] tune/*.[ch] \
907-
libbtrfsutil/*.[ch]
904+
$(Q)$(ETAGS_CMD) $(tags_files)
908905

909906
cscope: FORCE
910907
@echo " CSCOPE $(CSCOPE_CMD)"
911-
$(Q)ls -1 *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] check/*.[ch] \
912-
kernel-lib/*.[ch] kernel-shared/*.[ch] libbtrfsutil/*.[ch] \
913-
cmds/*.[ch] common/*.[ch] tune/*.[ch] \
914-
> cscope.files
908+
$(Q)ls -1 $(tags_files) > cscope.files
915909
$(Q)$(CSCOPE_CMD)
916910

917911
clean-all: clean clean-doc clean-gen

0 commit comments

Comments
 (0)