diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libavl/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libnvpair/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libspl/Makefile.in | 12 | ||||
-rw-r--r-- | lib/libspl/asm-i686/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libspl/asm-x86_64/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libspl/include/Makefile.in | 54 | ||||
-rw-r--r-- | lib/libunicode/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libuutil/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libzfs/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libzpool/Makefile.in | 1 | ||||
-rw-r--r-- | lib/libzpool/include/Makefile.in | 50 |
12 files changed, 102 insertions, 23 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index be2f3f4f9..cac589652 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -111,6 +111,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 5920e098f..992aca826 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -128,6 +128,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 2d004ca6d..2933be561 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -129,6 +129,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 9f37ab9d3..a4b147467 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -66,7 +66,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libspl_la_LIBADD = am_libspl_la_OBJECTS = getexecname.lo gethrtime.lo getmntany.lo \ list.lo mkdirp.lo strlcat.lo strlcpy.lo strnlen.lo zone.lo \ - atomic.lo + xdr.lo atomic.lo libspl_la_OBJECTS = $(am_libspl_la_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -140,6 +140,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -247,6 +248,7 @@ libspl_la_SOURCES = \ ${top_srcdir}/lib/libspl/strlcpy.c \ ${top_srcdir}/lib/libspl/strnlen.c \ ${top_srcdir}/lib/libspl/zone.c \ + ${top_srcdir}/lib/libspl/xdr.c \ ${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \ ${top_srcdir}/lib/libspl/include/sys/list.h \ ${top_srcdir}/lib/libspl/include/sys/list_impl.h @@ -328,6 +330,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zone.Plo@am__quote@ .S.o: @@ -426,6 +429,13 @@ zone.lo: ${top_srcdir}/lib/libspl/zone.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c +xdr.lo: ${top_srcdir}/lib/libspl/xdr.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdr.lo -MD -MP -MF "$(DEPDIR)/xdr.Tpo" -c -o xdr.lo `test -f '${top_srcdir}/lib/libspl/xdr.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/xdr.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xdr.Tpo" "$(DEPDIR)/xdr.Plo"; else rm -f "$(DEPDIR)/xdr.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/lib/libspl/xdr.c' object='xdr.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdr.lo `test -f '${top_srcdir}/lib/libspl/xdr.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/xdr.c + mostlyclean-libtool: -rm -f *.lo diff --git a/lib/libspl/asm-i686/Makefile.in b/lib/libspl/asm-i686/Makefile.in index 92d69aeab..9f4f268de 100644 --- a/lib/libspl/asm-i686/Makefile.in +++ b/lib/libspl/asm-i686/Makefile.in @@ -107,6 +107,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index ffc98e8a9..e7c95ef38 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -107,6 +107,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index d0232d1fd..9f9da5a14 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = lib/libspl/include -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ @@ -56,7 +56,15 @@ CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -HEADERS = $(noinst_HEADERS) +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 = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgincludedir)" +pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -107,6 +115,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -190,8 +199,8 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -noinst_HEADERS = *.h ia32/sys/*.h sys/*.h sys/fm/*.h sys/sysevent/*.h \ - tsol/*.h +pkginclude_HEADERS = *.h ia32/sys/*.h rpc/*.h sys/*.h sys/fm/*.h \ + sys/sysevent/*.h tsol/*.h all: all-am .SUFFIXES: @@ -234,6 +243,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + +uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -284,7 +310,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/ia32/sys $(distdir)/sys $(distdir)/sys/fm $(distdir)/sys/sysevent $(distdir)/tsol + $(mkdir_p) $(distdir)/ia32/sys $(distdir)/rpc $(distdir)/sys $(distdir)/sys/fm $(distdir)/sys/sysevent $(distdir)/tsol @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -315,6 +341,9 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(pkgincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -358,7 +387,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-pkgincludeHEADERS install-exec-am: @@ -384,18 +413,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean 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-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + install-info-am install-man install-pkgincludeHEADERS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 0176478aa..db56c41dc 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -128,6 +128,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index e6b472053..4674cb3db 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -130,6 +130,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 1cd7eb666..3d71098e7 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -131,6 +131,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 56a07c97a..338bc023d 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -148,6 +148,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index d17b08d49..48a8be6a6 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = lib/libzpool/include -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ @@ -56,7 +56,15 @@ CONFIG_HEADER = $(top_builddir)/zfs_config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -HEADERS = $(noinst_HEADERS) +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 = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgincludedir)" +pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -107,6 +115,7 @@ LIBTOOL = @LIBTOOL@ LICENSE = @LICENSE@ LINUX = @LINUX@ LINUX_OBJ = @LINUX_OBJ@ +LINUX_VERSION = @LINUX_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -190,7 +199,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -noinst_HEADERS = sys/*.h +pkginclude_HEADERS = sys/*.h all: all-am .SUFFIXES: @@ -233,6 +242,23 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + +uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -314,6 +340,9 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(pkgincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -357,7 +386,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-pkgincludeHEADERS install-exec-am: @@ -383,18 +412,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean 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-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + install-info-am install-man install-pkgincludeHEADERS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |