aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mount_zfs/Makefile.am4
-rw-r--r--cmd/raidz_test/Makefile.am6
-rw-r--r--cmd/zdb/Makefile.am5
-rw-r--r--cmd/zed/Makefile.am10
-rw-r--r--cmd/zfs/Makefile.am6
-rw-r--r--cmd/zhack/Makefile.am5
-rw-r--r--cmd/zinject/Makefile.am4
-rw-r--r--cmd/zpool/Makefile.am10
-rw-r--r--cmd/zstream/Makefile.am4
-rw-r--r--cmd/ztest/Makefile.am5
10 files changed, 33 insertions, 26 deletions
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
index ddacf32c6..616ee65a7 100644
--- a/cmd/mount_zfs/Makefile.am
+++ b/cmd/mount_zfs/Makefile.am
@@ -13,6 +13,6 @@ mount_zfs_SOURCES = \
mount_zfs.c
mount_zfs_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
- $(top_builddir)/lib/libzfs/libzfs.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la
diff --git a/cmd/raidz_test/Makefile.am b/cmd/raidz_test/Makefile.am
index 0b173ed50..387cc7d8a 100644
--- a/cmd/raidz_test/Makefile.am
+++ b/cmd/raidz_test/Makefile.am
@@ -14,7 +14,7 @@ raidz_test_SOURCES = \
raidz_bench.c
raidz_test_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libzpool/libzpool.la
+ $(top_builddir)/lib/libzpool/libzpool.la \
+ $(top_builddir)/lib/libzfs_core/libzfs_core.la
-raidz_test_LDADD += -lm -ldl
+raidz_test_LDADD += -lm
diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
index 07c1d068b..68de8ea3c 100644
--- a/cmd/zdb/Makefile.am
+++ b/cmd/zdb/Makefile.am
@@ -11,5 +11,6 @@ zdb_SOURCES = \
zdb.h
zdb_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libzpool/libzpool.la
+ $(top_builddir)/lib/libzpool/libzpool.la \
+ $(top_builddir)/lib/libzfs_core/libzfs_core.la \
+ $(top_builddir)/lib/libnvpair/libnvpair.la
diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
index b6c89bfc3..89b4d899b 100644
--- a/cmd/zed/Makefile.am
+++ b/cmd/zed/Makefile.am
@@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am
+AM_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
+
SUBDIRS = zed.d
sbin_PROGRAMS = zed
@@ -36,12 +38,12 @@ FMA_SRC = \
zed_SOURCES = $(ZED_SRC) $(FMA_SRC)
zed_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libuutil/libuutil.la \
+ $(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
- $(top_builddir)/lib/libzfs/libzfs.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libuutil/libuutil.la
-zed_LDADD += -lrt
+zed_LDADD += -lrt $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
zed_LDFLAGS = -pthread
EXTRA_DIST = agents/README.md
diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am
index c824bf61e..1ce721a8b 100644
--- a/cmd/zfs/Makefile.am
+++ b/cmd/zfs/Makefile.am
@@ -11,10 +11,10 @@ zfs_SOURCES = \
zfs_projectutil.h
zfs_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzfs/libzfs.la \
- $(top_builddir)/lib/libzfs_core/libzfs_core.la
+ $(top_builddir)/lib/libzfs_core/libzfs_core.la \
+ $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libuutil/libuutil.la
if BUILD_FREEBSD
zfs_LDADD += -L/usr/local/lib -lintl -lgeom -ljail
diff --git a/cmd/zhack/Makefile.am b/cmd/zhack/Makefile.am
index ac4b6aadb..3f6ef1215 100644
--- a/cmd/zhack/Makefile.am
+++ b/cmd/zhack/Makefile.am
@@ -6,5 +6,6 @@ zhack_SOURCES = \
zhack.c
zhack_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libzpool/libzpool.la
+ $(top_builddir)/lib/libzpool/libzpool.la \
+ $(top_builddir)/lib/libzfs_core/libzfs_core.la \
+ $(top_builddir)/lib/libnvpair/libnvpair.la
diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
index b056a6db5..7c4a5fdbb 100644
--- a/cmd/zinject/Makefile.am
+++ b/cmd/zinject/Makefile.am
@@ -8,6 +8,6 @@ zinject_SOURCES = \
zinject.h
zinject_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
- $(top_builddir)/lib/libzfs/libzfs.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
index 1dcb98520..04bdbffcd 100644
--- a/cmd/zpool/Makefile.am
+++ b/cmd/zpool/Makefile.am
@@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am
+AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
+
DEFAULT_INCLUDES += -I$(srcdir)
sbin_PROGRAMS = zpool
@@ -20,15 +22,15 @@ zpool_SOURCES += os/linux/zpool_vdev_os.c
endif
zpool_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libuutil/libuutil.la \
+ $(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
- $(top_builddir)/lib/libzfs/libzfs.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libuutil/libuutil.la
if BUILD_FREEBSD
zpool_LDADD += -L/usr/local/lib -lintl -lgeom
endif
-zpool_LDADD += -lm $(LIBBLKID)
+zpool_LDADD += -lm $(LIBBLKID_LIBS) $(LIBUUID_LIBS)
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
zpoolexecdir = $(zfsexecdir)/zpool.d
diff --git a/cmd/zstream/Makefile.am b/cmd/zstream/Makefile.am
index ebc07d2ea..a3b678d0a 100644
--- a/cmd/zstream/Makefile.am
+++ b/cmd/zstream/Makefile.am
@@ -9,6 +9,6 @@ zstream_SOURCES = \
zstream_redup.c
zstream_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
+ $(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la \
- $(top_builddir)/lib/libzfs/libzfs.la
+ $(top_builddir)/lib/libnvpair/libnvpair.la
diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
index db9a104c0..4790e62ca 100644
--- a/cmd/ztest/Makefile.am
+++ b/cmd/ztest/Makefile.am
@@ -15,8 +15,9 @@ ztest_SOURCES = \
ztest.c
ztest_LDADD = \
- $(top_builddir)/lib/libnvpair/libnvpair.la \
- $(top_builddir)/lib/libzpool/libzpool.la
+ $(top_builddir)/lib/libzpool/libzpool.la \
+ $(top_builddir)/lib/libzfs_core/libzfs_core.la \
+ $(top_builddir)/lib/libnvpair/libnvpair.la
ztest_LDADD += -lm
ztest_LDFLAGS = -pthread
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 13:25:13 +0000