diff options
32 files changed, 154 insertions, 485 deletions
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am index 168da5cbe..9483c7612 100644 --- a/cmd/mount_zfs/Makefile.am +++ b/cmd/mount_zfs/Makefile.am @@ -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 diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in index 44d07667e..ccb4cbcf9 100644 --- a/cmd/mount_zfs/Makefile.in +++ b/cmd/mount_zfs/Makefile.in @@ -97,12 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_mount_zfs_OBJECTS = mount_zfs.$(OBJEXT) mount_zfs_OBJECTS = $(am_mount_zfs_OBJECTS) -mount_zfs_DEPENDENCIES = $(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 \ +mount_zfs_DEPENDENCIES = $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzfs/libzfs.la AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -333,11 +328,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 diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am index 9304bfc0a..f82f1a3b5 100644 --- a/cmd/zdb/Makefile.am +++ b/cmd/zdb/Makefile.am @@ -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 diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 4fd55e5fa..534e8639c 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -97,11 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_zdb_OBJECTS = zdb.$(OBJEXT) zdb_il.$(OBJEXT) zdb_OBJECTS = $(am_zdb_OBJECTS) -zdb_DEPENDENCIES = $(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 \ +zdb_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -330,11 +326,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 diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am index 1b7cd841c..8f381f190 100644 --- a/cmd/zfs/Makefile.am +++ b/cmd/zfs/Makefile.am @@ -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 diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 0b9b4dcc6..a5e9d7aac 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -97,11 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_zfs_OBJECTS = zfs_iter.$(OBJEXT) zfs_main.$(OBJEXT) zfs_OBJECTS = $(am_zfs_OBJECTS) -zfs_DEPENDENCIES = $(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 \ +zfs_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -332,11 +328,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 diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am index eb67b1569..d1d32d57f 100644 --- a/cmd/zinject/Makefile.am +++ b/cmd/zinject/Makefile.am @@ -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 diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 8adfaab39..a7cc3994d 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -97,11 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_zinject_OBJECTS = translate.$(OBJEXT) zinject.$(OBJEXT) zinject_OBJECTS = $(am_zinject_OBJECTS) -zinject_DEPENDENCIES = $(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 \ +zinject_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -331,11 +327,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 diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index d3ca0612a..2ce8efc5c 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -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 diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 127b93690..b78dcd0f2 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -98,11 +98,7 @@ PROGRAMS = $(sbin_PROGRAMS) am_zpool_OBJECTS = zpool_iter.$(OBJEXT) zpool_main.$(OBJEXT) \ zpool_util.$(OBJEXT) zpool_vdev.$(OBJEXT) zpool_OBJECTS = $(am_zpool_OBJECTS) -zpool_DEPENDENCIES = $(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 \ +zpool_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -334,11 +330,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 diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index a20969ea6..39892013a 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -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 diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index dc6549b6c..6adc11198 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -97,11 +97,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) am_ztest_OBJECTS = ztest.$(OBJEXT) ztest_OBJECTS = $(am_ztest_OBJECTS) -ztest_DEPENDENCIES = $(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 \ +ztest_DEPENDENCIES = $(top_builddir)/lib/libnvpair/libnvpair.la \ $(top_builddir)/lib/libuutil/libuutil.la \ $(top_builddir)/lib/libzpool/libzpool.la \ $(top_builddir)/lib/libzfs/libzfs.la @@ -330,11 +326,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 diff --git a/lib/Makefile.am b/lib/Makefile.am index 0d518d220..51a8abd0c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 diff --git a/lib/Makefile.in b/lib/Makefile.in index 5929cc468..3cdebcae1 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -315,7 +315,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevruledir = @udevruledir@ -SUBDIRS = libspl libavl libefi libnvpair libshare libunicode libuutil \ + +# NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries +# These five libraries are intermediary build components. + +# These four libraries, which are installed as the final build product, +# incorporate the five convenience libraries given above. +SUBDIRS = libspl libavl libefi libshare libunicode libnvpair libuutil \ libzpool libzfs all: all-recursive diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am index 399392026..b5e68fdb5 100644 --- a/lib/libavl/Makefile.am +++ b/lib/libavl/Makefile.am @@ -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 diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 9a6ea3a75..2bae37eec 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -92,38 +92,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libavl_la_LIBADD = am_libavl_la_OBJECTS = avl.lo libavl_la_OBJECTS = $(am_libavl_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libavl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libavl_la_LDFLAGS) $(LDFLAGS) -o $@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -339,11 +314,10 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \ $(FRAME_LARGER_THAN) -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 all: all-am .SUFFIXES: @@ -378,39 +352,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libavl.la: $(libavl_la_OBJECTS) $(libavl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libavl_la_LINK) -rpath $(libdir) $(libavl_la_OBJECTS) $(libavl_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libavl_la_OBJECTS) $(libavl_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -544,9 +496,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -574,7 +523,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -601,7 +550,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -641,23 +590,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am index cf9e3f11c..aa57dba9a 100644 --- a/lib/libefi/Makefile.am +++ b/lib/libefi/Makefile.am @@ -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 diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in index 7abee8cab..8946cc1b2 100644 --- a/lib/libefi/Makefile.in +++ b/lib/libefi/Makefile.in @@ -92,38 +92,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libefi_la_LIBADD = am_libefi_la_OBJECTS = rdwr_efi.lo libefi_la_OBJECTS = $(am_libefi_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libefi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libefi_la_LDFLAGS) $(LDFLAGS) -o $@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -339,11 +314,10 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \ $(FRAME_LARGER_THAN) -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 all: all-am .SUFFIXES: @@ -378,39 +352,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libefi.la: $(libefi_la_OBJECTS) $(libefi_la_DEPENDENCIES) - $(AM_V_CCLD)$(libefi_la_LINK) -rpath $(libdir) $(libefi_la_OBJECTS) $(libefi_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libefi_la_OBJECTS) $(libefi_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -544,9 +496,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -574,7 +523,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -601,7 +550,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -641,23 +590,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am index 919e45337..b0cf8ad23 100644 --- a/lib/libnvpair/Makefile.am +++ b/lib/libnvpair/Makefile.am @@ -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 diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 33d3f3b1d..5162c4d20 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -347,7 +347,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 diff --git a/lib/libshare/Makefile.am b/lib/libshare/Makefile.am index b66df8c56..1439b33ac 100644 --- a/lib/libshare/Makefile.am +++ b/lib/libshare/Makefile.am @@ -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 diff --git a/lib/libshare/Makefile.in b/lib/libshare/Makefile.in index 67d23d279..706d0041a 100644 --- a/lib/libshare/Makefile.in +++ b/lib/libshare/Makefile.in @@ -92,38 +92,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libshare_la_LIBADD = am_libshare_la_OBJECTS = libshare.lo nfs.lo libshare_la_OBJECTS = $(am_libshare_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libshare_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libshare_la_LDFLAGS) $(LDFLAGS) -o $@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -338,14 +313,13 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" -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 all: all-am .SUFFIXES: @@ -380,39 +354,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libshare.la: $(libshare_la_OBJECTS) $(libshare_la_DEPENDENCIES) - $(AM_V_CCLD)$(libshare_la_LINK) -rpath $(libdir) $(libshare_la_OBJECTS) $(libshare_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libshare_la_OBJECTS) $(libshare_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -555,9 +507,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -585,7 +534,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -612,7 +561,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -652,23 +601,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am index 586e6c0da..089056c56 100644 --- a/lib/libspl/Makefile.am +++ b/lib/libspl/Makefile.am @@ -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 \ @@ -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 diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index db3499a6d..4bfac4eb5 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -92,29 +92,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libspl_la_LIBADD = am_libspl_la_OBJECTS = getexecname.lo gethrtime.lo gethrestime.lo \ getmntany.lo list.lo mkdirp.lo strlcat.lo strlcpy.lo \ @@ -392,7 +370,7 @@ DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64 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 \ $(top_srcdir)/lib/libspl/gethrtime.c \ @@ -410,7 +388,7 @@ 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 all: all-recursive .SUFFIXES: @@ -445,39 +423,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libspl.la: $(libspl_la_OBJECTS) $(libspl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libspl_la_LINK) -rpath $(libdir) $(libspl_la_OBJECTS) $(libspl_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libspl_la_LINK) $(libspl_la_OBJECTS) $(libspl_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -855,9 +811,6 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -885,7 +838,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-recursive @@ -912,7 +865,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-recursive @@ -952,26 +905,25 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-libLTLIBRARIES + all all-am check check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am index 32be0529b..c28519aa2 100644 --- a/lib/libunicode/Makefile.am +++ b/lib/libunicode/Makefile.am @@ -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 diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index fbcb32b99..c2c81ad41 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -92,38 +92,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libunicode_la_LIBADD = am_libunicode_la_OBJECTS = u8_textprep.lo uconv.lo libunicode_la_OBJECTS = $(am_libunicode_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libunicode_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libunicode_la_LDFLAGS) $(LDFLAGS) -o $@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -339,12 +314,11 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \ $(FRAME_LARGER_THAN) -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 all: all-am .SUFFIXES: @@ -379,39 +353,17 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libunicode.la: $(libunicode_la_OBJECTS) $(libunicode_la_DEPENDENCIES) - $(AM_V_CCLD)$(libunicode_la_LINK) -rpath $(libdir) $(libunicode_la_OBJECTS) $(libunicode_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libunicode_la_OBJECTS) $(libunicode_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -554,9 +506,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -584,7 +533,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -611,7 +560,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -651,23 +600,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am index f073cdbe4..2b2d5c1aa 100644 --- a/lib/libuutil/Makefile.am +++ b/lib/libuutil/Makefile.am @@ -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 \ @@ -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 diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 6507a7ead..0ffdc0060 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -115,7 +115,9 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libuutil_la_DEPENDENCIES = $(top_builddir)/lib/libavl/libavl.la +libuutil_la_DEPENDENCIES = $(top_builddir)/lib/libavl/libavl.la \ + $(top_builddir)/lib/libspl/libspl.la \ + $(top_builddir)/lib/libefi/libefi.la am_libuutil_la_OBJECTS = uu_alloc.lo uu_avl.lo uu_dprintf.lo \ uu_ident.lo uu_list.lo uu_misc.lo uu_open.lo uu_pname.lo \ uu_string.lo uu_strtoint.lo @@ -342,7 +344,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \ $(FRAME_LARGER_THAN) 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 \ @@ -355,7 +356,12 @@ 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 all: all-am .SUFFIXES: diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index dfe87edab..4e3a48573 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -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 \ @@ -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) diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index a975a193f..d524a37b8 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -115,11 +115,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \ - $(top_builddir)/lib/libefi/libefi.la \ +libzfs_la_DEPENDENCIES = $(top_builddir)/lib/libshare/libshare.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 am_libzfs_la_OBJECTS = libzfs_changelist.lo libzfs_config.lo \ libzfs_dataset.lo libzfs_diff.lo libzfs_fru.lo libzfs_graph.lo \ @@ -347,14 +344,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -DTEXT_DOMAIN=\"zfs-linux-user\" 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 \ @@ -369,7 +358,12 @@ 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) all: all-am .SUFFIXES: diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index a9a7a1e14..d445d340d 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -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 \ @@ -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 \ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 5e1fded91..126d9c4c3 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -117,8 +117,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) libzpool_la_DEPENDENCIES = \ $(top_builddir)/lib/libunicode/libunicode.la \ - $(top_builddir)/lib/libavl/libavl.la \ - $(top_builddir)/lib/libspl/libspl.la + $(top_builddir)/lib/libuutil/libuutil.la am_libzpool_la_OBJECTS = kernel.lo taskq.lo util.lo zfs_comutil.lo \ zfs_deleg.lo zfs_fletcher.lo zfs_namecheck.lo zfs_prop.lo \ zfs_uio.lo zpool_prop.lo zprop_common.lo arc.lo bplist.lo \ @@ -358,11 +357,6 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \ -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \ $(FRAME_LARGER_THAN) 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 \ @@ -443,7 +437,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 \ $(top_srcdir)/module/zfs/zfs_acl.c \ |