diff options
| author | David Sterba <dsterba@suse.com> | 2017-01-27 18:34:51 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-03-08 13:00:45 +0100 |
| commit | 839d857c7ef3d834382788a77022e73d4bf43bd7 (patch) | |
| tree | 94c19a21db19dd81527df17971e6129f03b863fd | |
| parent | c439152191c2bea729e8b51eaa664a575513f39e (diff) | |
btrfs-progs: build: split LIBS
Not all the build targets use all libs listed in LIBS, separate the
common and compression ones.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 033a7bb3..952d9d02 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,14 +75,17 @@ CFLAGS = @CFLAGS@ \ LDFLAGS = @LDFLAGS@ \ -rdynamic -L$(TOPDIR) $(EXTRA_LDFLAGS) -LIBS = @UUID_LIBS@ @BLKID_LIBS@ @ZLIB_LIBS@ @LZO2_LIBS@ -L. -pthread -LIBBTRFS_LIBS = $(LIBS) +LIBS_BASE = @UUID_LIBS@ @BLKID_LIBS@ -L. -pthread +LIBS_COMP = @ZLIB_LIBS@ @LZO2_LIBS@ +LIBS = $(LIBS_BASE) +LIBBTRFS_LIBS = $(LIBS_BASE) # Static compilation flags STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections STATIC_LDFLAGS = -static -Wl,--gc-sections -STATIC_LIBS = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ \ - @ZLIB_LIBS_STATIC@ @LZO2_LIBS_STATIC@ -L. -pthread +STATIC_LIBS_BASE = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ -L. -pthread +STATIC_LIBS_COMP = @ZLIB_LIBS_STATIC@ @LZO2_LIBS_STATIC@ +STATIC_LIBS = $(STATIC_LIBS_BASE) # don't use FORTIFY with sparse because glibc with FORTIFY can # generate so many sparse errors that sparse stops parsing, @@ -365,12 +368,12 @@ btrfs-%: $(objects) $(libs_static) btrfs-%.o $(standalone_deps) btrfs: $(objects) btrfs.o $(cmds_objects) $(libs_static) @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o $(cmds_objects) \ - $(objects) $(libs_static) $(LDFLAGS) $(LIBS) + $(objects) $(libs_static) $(LDFLAGS) $(LIBS) $(LIBS_COMP) btrfs.static: $(static_objects) btrfs.static.o $(static_cmds_objects) $(static_libbtrfs_objects) @echo " [LD] $@" $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o $(static_cmds_objects) \ - $(static_objects) $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) + $(static_objects) $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck' btrfsck: btrfs @@ -403,12 +406,12 @@ btrfstune.static: $(static_objects) btrfstune.static.o $(static_libbtrfs_objects btrfs-image: $(objects) $(libs_static) image/main.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -I$(TOPDIR)/image -o btrfs-image $(objects) image/main.o $(libs_static) $(LDFLAGS) $(LIBS) + $(Q)$(CC) $(CFLAGS) -I$(TOPDIR)/image -o btrfs-image $(objects) image/main.o $(libs_static) $(LDFLAGS) $(LIBS) $(LIBS_COMP) btrfs-image.static: $(static_objects) image/main.static.o $(static_libbtrfs_objects) @echo " [LD] $@" $(Q)$(CC) $(STATIC_CFLAGS) -o $@ image/main.static.o $(static_objects) \ - $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) + $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) btrfs-convert: $(objects) $(libs_static) $(convert_objects) @echo " [LD] $@" |