mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-03-11 04:46:18 +03:00
libunicode: merge into libzpool
It's a single source file that is not used anywhere else, so there's no reason to keep it separate. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes #18071
This commit is contained in:
parent
648a9a2938
commit
309006a0c6
@ -57,7 +57,6 @@ include $(srcdir)/%D%/libavl/Makefile.am
|
||||
include $(srcdir)/%D%/libicp/Makefile.am
|
||||
include $(srcdir)/%D%/libnvpair/Makefile.am
|
||||
include $(srcdir)/%D%/libspl/Makefile.am
|
||||
include $(srcdir)/%D%/libunicode/Makefile.am
|
||||
include $(srcdir)/%D%/libzdb/Makefile.am
|
||||
include $(srcdir)/%D%/libzfs_core/Makefile.am
|
||||
include $(srcdir)/%D%/libzfs/Makefile.am
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
libunicode_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
|
||||
|
||||
noinst_LTLIBRARIES += libunicode.la
|
||||
|
||||
nodist_libunicode_la_SOURCES = \
|
||||
module/unicode/u8_textprep.c
|
||||
@ -46,6 +46,8 @@ nodist_libzpool_la_SOURCES = \
|
||||
\
|
||||
module/os/linux/zfs/zio_crypt.c \
|
||||
\
|
||||
module/unicode/u8_textprep.c \
|
||||
\
|
||||
module/zcommon/cityhash.c \
|
||||
module/zcommon/simd_stat.c \
|
||||
module/zcommon/zfeature_common.c \
|
||||
@ -196,7 +198,6 @@ nodist_libzpool_la_SOURCES = \
|
||||
|
||||
libzpool_la_LIBADD = \
|
||||
libicp.la \
|
||||
libunicode.la \
|
||||
libnvpair.la \
|
||||
libzstd.la \
|
||||
libzutil.la
|
||||
|
||||
Loading…
Reference in New Issue
Block a user