diff options
| author | David Sterba <dsterba@suse.com> | 2017-01-27 17:55:25 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-03-08 13:00:45 +0100 |
| commit | c439152191c2bea729e8b51eaa664a575513f39e (patch) | |
| tree | f3ce41a9c3957d308df3fc0a8f367e95e8fb9dea /Makefile.in | |
| parent | 30dc24dc84748f5c3858f5edbe7cf305b246dbbd (diff) | |
btrfs-progs: build: list mkfs.btrfs build objects in a variable
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 207d84d8..033a7bb3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,6 +115,7 @@ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-l extent_io.h ioctl.h ctree.h btrfsck.h version.h convert_objects = convert/main.o convert/common.o convert/source-fs.o \ convert/source-ext2.o +mkfs_objects = mkfs/main.o mkfs/common.o TESTS = fsck-tests.sh convert-tests.sh @@ -229,6 +230,7 @@ static_objects = $(patsubst %.o, %.static.o, $(objects)) static_cmds_objects = $(patsubst %.o, %.static.o, $(cmds_objects)) static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects)) static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects)) +static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects)) libs_shared = libbtrfs.so.0.1 libs_static = libbtrfs.a @@ -379,15 +381,15 @@ btrfsck.static: btrfs.static @echo " [LN] $@" $(Q)$(LN_S) -f $^ $@ -mkfs.btrfs: $(objects) $(libs_static) mkfs/main.o mkfs/common.o +mkfs.btrfs: $(objects) $(libs_static) $(mkfs_objects) @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o mkfs.btrfs $(objects) $(libs_static) \ - mkfs/main.o mkfs/common.o $(LDFLAGS) $(LIBS) + $(mkfs_objects) $(LDFLAGS) $(LIBS) -mkfs.btrfs.static: $(static_objects) mkfs/main.static.o mkfs/common.static.o $(static_libbtrfs_objects) +mkfs.btrfs.static: $(static_objects) $(static_mkfs_objects) $(static_libbtrfs_objects) @echo " [LD] $@" $(Q)$(CC) $(STATIC_CFLAGS) -o mkfs.btrfs.static \ - mkfs/main.static.o mkfs/common.static.o $(static_objects) \ + $(static_mkfs_objects) $(static_objects) \ $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) btrfstune: $(objects) $(libs_static) btrfstune.o |