diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | autogen.sh | 1 | ||||
| -rw-r--r-- | lib/libzpool/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libzpool/Makefile.in | 2 | ||||
| -rw-r--r-- | zfs.spec.in | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 3689d1f8f..5a0791b44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR) AUTOMAKE_OPTIONS = foreign dist-zip EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am -EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT README.markdown +EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE noinst_HEADERS = zfs_config.h @@ -24,11 +24,10 @@ distclean-local:: -o -name .pc -o -name .hg -o -name .git \) -prune -o \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \ + -o -name '.*.rej' -o -name '.script-config' -o -size 0 \ -o -name '*%' -o -name '.*.cmd' -o -name 'core' \ -o -name 'Makefile' -o -name 'Module.symvers' \ - -o -name '*.order' -o -name '*.markers' \ - -o -name '.script-config' \) \ + -o -name '*.order' -o -name '*.markers' \) \ -type f -print | xargs $(RM) if CONFIG_KERNEL diff --git a/Makefile.in b/Makefile.in index c91470ec2..87ed50c78 100644 --- a/Makefile.in +++ b/Makefile.in @@ -326,8 +326,8 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR) AUTOMAKE_OPTIONS = foreign dist-zip EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in \ config/config.awk config/rpm.am config/deb.am config/tgz.am \ - META DISCLAIMER COPYRIGHT GIT README.markdown \ - OPENSOLARIS.LICENSE ZFS.RELEASE + META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE \ + ZFS.RELEASE noinst_HEADERS = zfs_config.h all: zfs_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -924,11 +924,10 @@ distclean-local:: -o -name .pc -o -name .hg -o -name .git \) -prune -o \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \ + -o -name '.*.rej' -o -name '.script-config' -o -size 0 \ -o -name '*%' -o -name '.*.cmd' -o -name 'core' \ -o -name 'Makefile' -o -name 'Module.symvers' \ - -o -name '*.order' -o -name '*.markers' \ - -o -name '.script-config' \) \ + -o -name '*.order' -o -name '*.markers' \) \ -type f -print | xargs $(RM) @CONFIG_KERNEL_TRUE@install-data-local: diff --git a/autogen.sh b/autogen.sh index 728000ae4..aba740f16 100644 --- a/autogen.sh +++ b/autogen.sh @@ -5,4 +5,3 @@ libtoolize --automake --copy autoheader && automake --add-missing --include-deps --copy autoconf -rm -rf autom4te.cache aclocal.m4 diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 2df3fb730..f91b4d078 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -152,13 +152,13 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/include/sys/zfs_stat.h \ ${top_srcdir}/module/zfs/include/sys/zfs_vfsops.h \ ${top_srcdir}/module/zfs/include/sys/zfs_znode.h \ - ${top_srcdir}/module/zfs/include/sys/zfs_zrlock.h \ ${top_srcdir}/module/zfs/include/sys/zil.h \ ${top_srcdir}/module/zfs/include/sys/zil_impl.h \ ${top_srcdir}/module/zfs/include/sys/zio_checksum.h \ ${top_srcdir}/module/zfs/include/sys/zio_compress.h \ ${top_srcdir}/module/zfs/include/sys/zio.h \ ${top_srcdir}/module/zfs/include/sys/zio_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zrlock.h \ ${top_srcdir}/module/zfs/include/sys/zvol.h \ ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \ ${top_srcdir}/module/zfs/include/sys/fm/util.h \ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 9ee45fa78..79bd73df6 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -516,13 +516,13 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/include/sys/zfs_stat.h \ ${top_srcdir}/module/zfs/include/sys/zfs_vfsops.h \ ${top_srcdir}/module/zfs/include/sys/zfs_znode.h \ - ${top_srcdir}/module/zfs/include/sys/zfs_zrlock.h \ ${top_srcdir}/module/zfs/include/sys/zil.h \ ${top_srcdir}/module/zfs/include/sys/zil_impl.h \ ${top_srcdir}/module/zfs/include/sys/zio_checksum.h \ ${top_srcdir}/module/zfs/include/sys/zio_compress.h \ ${top_srcdir}/module/zfs/include/sys/zio.h \ ${top_srcdir}/module/zfs/include/sys/zio_impl.h \ + ${top_srcdir}/module/zfs/include/sys/zrlock.h \ ${top_srcdir}/module/zfs/include/sys/zvol.h \ ${top_srcdir}/module/zfs/include/sys/fm/protocol.h \ ${top_srcdir}/module/zfs/include/sys/fm/util.h \ diff --git a/zfs.spec.in b/zfs.spec.in index 17e0131ad..9bec437b9 100644 --- a/zfs.spec.in +++ b/zfs.spec.in @@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER -%doc GIT OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE +%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE %{_sbindir}/* %{_bindir}/* %{_libdir}/* |