Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine libraries: spl, avl, efi, share, unicode. #509

Closed
wants to merge 1 commit into from
Closed

Combine libraries: spl, avl, efi, share, unicode. #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cmd/mount_zfs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ mount_zfs_SOURCES = \
$(top_srcdir)/cmd/mount_zfs/mount_zfs.c

mount_zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzfs/libzfs.la

Expand Down
4 changes: 0 additions & 4 deletions cmd/zdb/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ zdb_SOURCES = \
$(top_srcdir)/cmd/zdb/zdb_il.c

zdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
Expand Down
4 changes: 0 additions & 4 deletions cmd/zfs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ zfs_SOURCES = \
$(top_srcdir)/cmd/zfs/zfs_util.h

zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
Expand Down
4 changes: 0 additions & 4 deletions cmd/zinject/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ zinject_SOURCES = \
$(top_srcdir)/cmd/zinject/zinject.h

zinject_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
Expand Down
4 changes: 0 additions & 4 deletions cmd/zpool/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ zpool_SOURCES = \
$(top_srcdir)/cmd/zpool/zpool_vdev.c

zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
Expand Down
4 changes: 0 additions & 4 deletions cmd/ztest/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ ztest_SOURCES = \
$(top_srcdir)/cmd/ztest/ztest.c

ztest_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
Expand Down
9 changes: 7 additions & 2 deletions lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
SUBDIRS = libspl libavl libefi libnvpair libshare
SUBDIRS += libunicode libuutil libzpool libzfs
# NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries
# These five libraries are intermediary build components.
SUBDIRS = libspl libavl libefi libshare libunicode

# These four libraries, which are installed as the final build product,
# incorporate the five convenience libraries given above.
SUBDIRS += libnvpair libuutil libzpool libzfs
4 changes: 1 addition & 3 deletions lib/libavl/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include

lib_LTLIBRARIES = libavl.la
noinst_LTLIBRARIES = libavl.la

libavl_la_SOURCES = \
$(top_srcdir)/module/avl/avl.c

libavl_la_LDFLAGS = -version-info 1:0:0
4 changes: 1 addition & 3 deletions lib/libefi/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include

lib_LTLIBRARIES = libefi.la
noinst_LTLIBRARIES = libefi.la

libefi_la_SOURCES = \
$(top_srcdir)/lib/libefi/rdwr_efi.c

libefi_la_LDFLAGS = -version-info 1:0:0
2 changes: 1 addition & 1 deletion lib/libnvpair/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ libnvpair_la_SOURCES = \
$(top_srcdir)/module/nvpair/nvpair_alloc_fixed.c \
$(top_srcdir)/module/nvpair/nvpair.c

libnvpair_la_LDFLAGS = -version-info 1:0:0
libnvpair_la_LDFLAGS = -version-info 1:1:0

EXTRA_DIST = \
$(top_srcdir)/module/nvpair/nvpair_alloc_spl.c
4 changes: 1 addition & 3 deletions lib/libshare/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include

lib_LTLIBRARIES = libshare.la
noinst_LTLIBRARIES = libshare.la

libshare_la_SOURCES = \
$(top_srcdir)/lib/libshare/libshare.c \
$(top_srcdir)/lib/libshare/nfs.c \
$(top_srcdir)/lib/libshare/libshare_impl.h \
$(top_srcdir)/lib/libshare/nfs.h

libshare_la_LDFLAGS = -version-info 1:0:0
4 changes: 2 additions & 2 deletions lib/libspl/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DEFAULT_INCLUDES += \
AM_CCASFLAGS = \
-I$(top_srcdir)/lib/libspl/include

lib_LTLIBRARIES = libspl.la
noinst_LTLIBRARIES = libspl.la

libspl_la_SOURCES = \
$(top_srcdir)/lib/libspl/getexecname.c \
Expand All @@ -30,4 +30,4 @@ libspl_la_SOURCES = \
$(top_srcdir)/lib/libspl/include/sys/list.h \
$(top_srcdir)/lib/libspl/include/sys/list_impl.h

libspl_la_LDFLAGS = -lrt -version-info 1:0:0
libspl_la_LDFLAGS = -lrt
4 changes: 1 addition & 3 deletions lib/libunicode/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include

lib_LTLIBRARIES = libunicode.la
noinst_LTLIBRARIES = libunicode.la

libunicode_la_SOURCES = \
$(top_srcdir)/module/unicode/u8_textprep.c \
$(top_srcdir)/module/unicode/uconv.c

libunicode_la_LDFLAGS = -version-info 1:0:0
9 changes: 6 additions & 3 deletions lib/libuutil/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ DEFAULT_INCLUDES += \

lib_LTLIBRARIES = libuutil.la

libuutil_la_LIBADD = $(top_builddir)/lib/libavl/libavl.la

libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_alloc.c \
$(top_srcdir)/lib/libuutil/uu_avl.c \
Expand All @@ -22,4 +20,9 @@ libuutil_la_SOURCES = \
$(top_srcdir)/lib/libuutil/uu_string.c \
$(top_srcdir)/lib/libuutil/uu_strtoint.c

libuutil_la_LDFLAGS = -version-info 1:0:0
libuutil_la_LIBADD = \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la

libuutil_la_LDFLAGS = -pthread -version-info 1:1:0
15 changes: 6 additions & 9 deletions lib/libzfs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ DEFAULT_INCLUDES += \

lib_LTLIBRARIES = libzfs.la

libzfs_la_LIBADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libefi/libefi.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libshare/libshare.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la

libzfs_la_SOURCES = \
$(top_srcdir)/lib/libzfs/libzfs_changelist.c \
$(top_srcdir)/lib/libzfs/libzfs_config.c \
Expand All @@ -28,4 +20,9 @@ libzfs_la_SOURCES = \
$(top_srcdir)/lib/libzfs/libzfs_status.c \
$(top_srcdir)/lib/libzfs/libzfs_util.c

libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX) -version-info 1:0:0
libzfs_la_LIBADD = \
$(top_builddir)/lib/libshare/libshare.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libzpool/libzpool.la

libzfs_la_LDFLAGS = -lm -ldl -version-info 1:1:0 $(LIBSELINUX)
11 changes: 5 additions & 6 deletions lib/libzpool/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ DEFAULT_INCLUDES += \

lib_LTLIBRARIES = libzpool.la

libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libspl/libspl.la

libzpool_la_SOURCES = \
$(top_srcdir)/lib/libzpool/kernel.c \
$(top_srcdir)/lib/libzpool/taskq.c \
Expand Down Expand Up @@ -93,7 +88,11 @@ libzpool_la_SOURCES = \
$(top_srcdir)/module/zfs/zle.c \
$(top_srcdir)/module/zfs/zrlock.c

libzpool_la_LDFLAGS = -pthread -version-info 1:0:0
libzpool_la_LIBADD = \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la

libzpool_la_LDFLAGS = -pthread -version-info 1:1:0

EXTRA_DIST = \
$(top_srcdir)/module/zfs/vdev_disk.c \
Expand Down