Merge tag 'upstream/0.6.5.5'

[mirror_spl-debian.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 53d4876fcaf74440b2133e02c69248c05e721691..4977448fda95ca7acf5baf63a031f5b726fb7c35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,27 @@
-include $(top_srcdir)/config/rpm.am
 
+ACLOCAL_AMFLAGS = -I config
+
+include config/rpm.am
+include config/deb.am
+include config/tgz.am
+
+SUBDIRS = include rpm
 if CONFIG_USER
-USER_DIR = lib cmd scripts
+SUBDIRS += lib cmd man scripts
 endif
 if CONFIG_KERNEL
-KERNEL_DIR = module include
+SUBDIRS += module
+
+extradir = @prefix@/src/spl-$(VERSION)
+extra_HEADERS = spl.release.in spl_config.h.in
+
+kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
+nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
 endif
-SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 
-AUTOMAKE_OPTIONS = foreign dist-zip
-EXTRA_DIST = autogen.sh spl.spec.in META DISCLAIMER
-noinst_HEADERS = spl_config.h spl_unconfig.h
+AUTOMAKE_OPTIONS = foreign
+EXTRA_DIST  = autogen.sh META DISCLAIMER copy-builtin
+EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 
 distclean-local::
        -$(RM) -R autom4te*.cache
@@ -20,45 +31,24 @@ distclean-local::
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
                -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
-               -o -name 'Makefile' -o -name '$(LINUX_SYMBOLS)' \) \
+               -o -name 'Makefile' -o -name '$(LINUX_SYMBOLS)' \
+               -o -name '*.order' -o -name '*.markers' \) \
                -type f -print | xargs $(RM)
 
-if CONFIG_KERNEL
-install-data-local:
-       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
-       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
-       echo "${SPL_META_VERSION}" >$$instdest/spl.release; \
-       for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
-               $(INSTALL) -D $$instfile $$instdest/$$instfile; \
-       done
-endif
+dist-hook:
+       sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
+               $(distdir)/META
 
 ctags:
-       $(RM) $(top_srcdir)/tags
+       $(RM) tags
        find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
 
 etags:
-       $(RM) $(top_srcdir)/TAGS
+       $(RM) TAGS
        find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a
 
 tags: ctags etags
 
-srpm-modules:
-       $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common
-
-srpm-utils:
-       $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common
-
-srpm: srpm-modules srpm-utils
-
-rpm-modules: srpm-modules
-       $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common
-
-rpm-utils: srpm-utils
-       $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common
-
-rpm-modules: srpm-modules
-
-rpm-utils: srpm-utils
-
-rpm: rpm-modules rpm-utils
+pkg: @DEFAULT_PACKAGE@
+pkg-kmod: @DEFAULT_PACKAGE@-kmod
+pkg-utils: @DEFAULT_PACKAGE@-utils