diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2020-06-12 10:14:10 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-06-18 12:34:23 -0700 |
| commit | 4b55c43828f06718657013269de5f052bf0c89dd (patch) | |
| tree | dd7b18c803d1bde068802a6aa843e3a898c3a370 | |
| parent | 1ceb06bfcc4f8ff51e7effed66c454cf7b43b39d (diff) | |
| download | f2fs-tools-4b55c43828f06718657013269de5f052bf0c89dd.tar.gz | |
lib: use ${libuuid_LIBS} instead of -luuid everywhere
Otherwise linking will fail if the library is in an uncommon location or has a
non-standard name.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | mkfs/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am index 83e2389..42c8d31 100644 --- a/mkfs/Makefile.am +++ b/mkfs/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include -libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \ +libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \ -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) install-exec-hook: diff --git a/tools/Makefile.am b/tools/Makefile.am index 446bb39..56bf2e4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,7 +10,7 @@ parse_f2fs_SOURCES = f2fs_io_parse.c if LINUX sbin_PROGRAMS += f2fscrypt f2fscrypt_SOURCES = f2fscrypt.c sha512.c -f2fscrypt_LDFLAGS = -luuid +f2fscrypt_LDFLAGS = ${libuuid_LIBS} dist_man_MANS = f2fscrypt.8 endif |