RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-27 08:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: build: merge object variables

Browse Source 
Now libbtrfs.a has own list and we can merge $objects and
$shared_objects again. Reformat it now that it's changed.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-09-22 16:16:02 +02:00
parent e0f7a9a902
commit d4dc4793fa
1 changed files with 67 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Makefile
View File

@ -143,13 +143,61 @@ CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \
-D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef \
-U_FORTIFY_SOURCE -Wdeclaration-after-statement -Wdefault-bitfield-sign
objects = kernel-shared/dir-item.o \
kernel-lib/list_sort.o \
kernel-shared/ulist.o check/qgroup-verify.o kernel-shared/backref.o \
common/string-table.o common/task-utils.o \
kernel-shared/inode.o kernel-shared/file.o common/help.o cmds/receive-dump.o \
common/fsfeatures.o \
common/format-output.o
objects = \
kernel-lib/list_sort.o \
kernel-lib/radix-tree.o \
kernel-lib/raid56.o \
kernel-lib/rbtree.o \
kernel-lib/tables.o \
kernel-shared/backref.o \
kernel-shared/ctree.o \
kernel-shared/delayed-ref.o \
kernel-shared/dir-item.o \
kernel-shared/disk-io.o \
kernel-shared/extent-tree.o \
kernel-shared/extent_io.o \
kernel-shared/file-item.o \
kernel-shared/file.o \
kernel-shared/free-space-cache.o \
kernel-shared/free-space-tree.o \
kernel-shared/inode-item.o \
kernel-shared/inode.o \
kernel-shared/print-tree.o \
kernel-shared/root-tree.o \
kernel-shared/transaction.o \
kernel-shared/ulist.o \
kernel-shared/uuid-tree.o \
kernel-shared/volumes.o \
kernel-shared/zoned.o \
common/device-scan.o \
common/device-utils.o \
common/extent-cache.o \
common/format-output.o \
common/fsfeatures.o \
common/help.o \
common/messages.o \
common/open-utils.o \
common/parse-utils.o \
common/path-utils.o \
common/rbtree-utils.o \
common/repair.o \
common/send-stream.o \
common/send-utils.o \
common/string-table.o \
common/task-utils.o \
common/units.o \
common/utils-lib.o \
common/utils.o \
check/qgroup-verify.o \
cmds/receive-dump.o \
btrfs-list.o \
crypto/crc32c.o \
crypto/hash.o \
crypto/xxhash.o \
$(CRYPTO_OBJECTS) \
libbtrfsutil/stubs.o \
libbtrfsutil/subvolume.o
cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
cmds/inspect.o cmds/balance.o cmds/send.o cmds/receive.o \
cmds/quota.o cmds/qgroup.o cmds/replace.o check/main.o \
@ -158,23 +206,6 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \
cmds/property.o cmds/filesystem-usage.o cmds/inspect-dump-tree.o \
cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \
mkfs/common.o check/mode-common.o check/mode-lowmem.o
shared_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o btrfs-list.o \
kernel-lib/radix-tree.o common/extent-cache.o kernel-shared/extent_io.o \
crypto/crc32c.o common/messages.o \
kernel-shared/uuid-tree.o common/utils-lib.o common/rbtree-utils.o \
kernel-shared/ctree.o kernel-shared/disk-io.o \
kernel-shared/extent-tree.o kernel-shared/delayed-ref.o \
kernel-shared/print-tree.o \
kernel-shared/free-space-cache.o kernel-shared/root-tree.o \
kernel-shared/volumes.o kernel-shared/transaction.o \
kernel-shared/free-space-tree.o common/repair.o kernel-shared/inode-item.o \
kernel-shared/file-item.o kernel-shared/zoned.o \
kernel-lib/raid56.o kernel-lib/tables.o \
common/device-scan.o common/path-utils.o \
common/utils.o libbtrfsutil/subvolume.o libbtrfsutil/stubs.o \
crypto/hash.o crypto/xxhash.o $(CRYPTO_OBJECTS) \
common/open-utils.o common/units.o common/device-utils.o \
common/parse-utils.o
libbtrfs_objects = \
kernel-lib/raid56.o \
@ -586,14 +617,14 @@ btrfs-%.static: btrfs-%.static.o $(static_objects) $(patsubst %.o,%.static.o,$(s
$(static_libbtrfs_objects) $(STATIC_LDFLAGS) \
$($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS)
btrfs-%: btrfs-%.o $(objects) $(shared_objects) $(standalone_deps) libbtrfsutil.a
btrfs-%: btrfs-%.o $(objects) $(standalone_deps) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $(objects) $@.o \
$($(subst -,_,$@-objects)) \
$(shared_objects) libbtrfsutil.a \
libbtrfsutil.a \
$(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs))
btrfs: btrfs.o $(objects) $(cmds_objects) $(shared_objects) libbtrfsutil.a
btrfs: btrfs.o $(objects) $(cmds_objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
@ -601,7 +632,7 @@ btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_l
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
btrfs.box: btrfs.box.o $(objects) $(cmds_objects) $(progs_box_objects) $(shared_objects) libbtrfsutil.a
btrfs.box: btrfs.box.o $(objects) $(cmds_objects) $(progs_box_objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(btrfs_convert_libs) $(LDFLAGS) $(LIBS) $(LIBS_COMP)
@ -629,7 +660,7 @@ btrfsck.static: btrfs.static
@echo " [LN] $@"
$(Q)$(LN_S) -f $^ $@
mkfs.btrfs: $(mkfs_objects) $(objects) $(shared_objects) libbtrfsutil.a
mkfs.btrfs: $(mkfs_objects) $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@ -637,7 +668,7 @@ mkfs.btrfs.static: $(static_mkfs_objects) $(static_objects) $(static_libbtrfs_ob
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
btrfstune: btrfstune.o $(objects) $(shared_objects) libbtrfsutil.a
btrfstune: btrfstune.o $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@ -645,7 +676,7 @@ btrfstune.static: btrfstune.static.o $(static_objects) $(static_libbtrfs_objects
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
btrfs-image: $(image_objects) $(objects) $(shared_objects) libbtrfsutil.a
btrfs-image: $(image_objects) $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
@ -653,7 +684,7 @@ btrfs-image.static: $(static_image_objects) $(static_objects) $(static_libbtrfs_
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
btrfs-convert: $(convert_objects) $(objects) $(shared_objects) libbtrfsutil.a
btrfs-convert: $(convert_objects) $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS)
@ -661,7 +692,7 @@ btrfs-convert.static: $(static_convert_objects) $(static_objects) $(static_libbt
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
quick-test: quick-test.o $(objects) $(shared_objects) libbtrfsutil.a $(libs_shared)
quick-test: quick-test.o $(objects) libbtrfsutil.a $(libs_shared)
@echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@ -726,15 +757,15 @@ fssum: tests/fssum.c crypto/sha224-256.c
@echo " [LD] $@"
$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
hash-speedtest: crypto/hash-speedtest.c $(objects) $(shared_objects) libbtrfsutil.a
hash-speedtest: crypto/hash-speedtest.c $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
hash-vectest: crypto/hash-vectest.c $(objects) $(shared_objects) libbtrfsutil.a
hash-vectest: crypto/hash-vectest.c $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
json-formatter-test: tests/json-formatter-test.c $(objects) $(shared_objects) libbtrfsutil.a
json-formatter-test: tests/json-formatter-test.c $(objects) libbtrfsutil.a
@echo " [LD] $@"
$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)