gnu: gxtuner: Update to 2.4.

[jackhill/guix/guix.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index db4ebe0..8fe9e35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,10 @@ nodist_noinst_SCRIPTS =                              \
   pre-inst-env                                 \
   test-env
 
+# Modules that are not compiled but are installed nonetheless, such as
+# build-side modules with unusual dependencies.
+MODULES_NOT_COMPILED =
+
 include gnu/local.mk
 
 MODULES =                                      \
@@ -46,6 +50,7 @@ MODULES =                                     \
   guix/sets.scm                                        \
   guix/modules.scm                             \
   guix/download.scm                            \
+  guix/discovery.scm                           \
   guix/git-download.scm                                \
   guix/hg-download.scm                         \
   guix/monads.scm                              \
@@ -205,8 +210,8 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
 # Auxiliary files for packages.
 AUX_FILES =                                            \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
-  gnu/packages/aux-files/linux-libre/4.10-i686.conf    \
-  gnu/packages/aux-files/linux-libre/4.10-x86_64.conf  \
+  gnu/packages/aux-files/linux-libre/4.11-i686.conf    \
+  gnu/packages/aux-files/linux-libre/4.11-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/4.9-i686.conf     \
   gnu/packages/aux-files/linux-libre/4.9-x86_64.conf   \
   gnu/packages/aux-files/linux-libre/4.4-i686.conf     \
@@ -222,8 +227,8 @@ EXAMPLES =                                  \
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
 
-nobase_dist_guilemodule_DATA =                  \
-  $(MODULES) $(AUX_FILES) $(EXAMPLES)            \
+nobase_dist_guilemodule_DATA =                                 \
+  $(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES)  \
   $(MISC_DISTRO_FILES)
 nobase_nodist_guilemodule_DATA = guix/config.scm
 nobase_nodist_guileobject_DATA = $(GOBJECTS)
@@ -275,6 +280,7 @@ SCM_TESTS =                                 \
   tests/records.scm                            \
   tests/upstream.scm                           \
   tests/combinators.scm                                \
+  tests/discovery.scm                          \
   tests/utils.scm                              \
   tests/build-utils.scm                                \
   tests/packages.scm                           \
@@ -379,7 +385,7 @@ check-local:
 
 endif !CAN_RUN_TESTS
 
-check-system: $(GOBJECTS)
+check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
        $(AM_V_at)$(top_builddir)/pre-inst-env                  \
           $(GUILE) --no-auto-compile                           \
           -e '(@@ (run-system-tests) run-system-tests)'        \
@@ -400,7 +406,6 @@ EXTRA_DIST =                                                \
   TODO                                                 \
   CODE-OF-CONDUCT                                      \
   .dir-locals.el                                       \
-  gnu/build/svg.scm                                    \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
   build-aux/hydra/evaluate.scm                         \
@@ -505,14 +510,18 @@ guix-binary.%.tar.xz:
        cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
 
 
-dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
+dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version
 dist-hook: assert-no-store-file-names
 
 distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
 
-sync-descriptions:
-       $(AM_V_at)GUIX_PACKAGE_PATH= \
-        $(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
+EXTRA_DIST += $(top_srcdir)/.version
+BUILT_SOURCES += $(top_srcdir)/.version
+$(top_srcdir)/.version:
+       echo $(VERSION) > "$@-t" && mv "$@-t" "$@"
+
+gen-tarball-version:
+       echo $(VERSION) > "$(distdir)/.tarball-version"
 
 gen-ChangeLog:
        $(AM_V_GEN)if test -d .git; then                \
@@ -561,9 +570,10 @@ hydra-jobs.scm: $(GOBJECTS)
          "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
        $(AM_V_at)mv "$@.tmp" "$@"
 
-.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
+.PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
+.PHONY: clean-go make-go
 
 ## -------------- ##
 ## Silent rules.  ##