Merge branch 'master' into core-updates-frozen
[jackhill/guix/guix.git] / Makefile.am
index 344b742..56f6027 100644 (file)
@@ -227,7 +227,6 @@ MODULES =                                   \
   guix/build/union.scm                         \
   guix/build/profiles.scm                      \
   guix/build/compile.scm                       \
-  guix/build/rpath.scm                         \
   guix/build/cvs.scm                           \
   guix/build/svn.scm                           \
   guix/build/syscalls.scm                       \
@@ -238,6 +237,7 @@ MODULES =                                   \
   guix/build/emacs-utils.scm                   \
   guix/build/java-utils.scm                    \
   guix/build/lisp-utils.scm                    \
+  guix/build/meson-configuration.scm           \
   guix/build/maven/java.scm                    \
   guix/build/maven/plugin.scm                  \
   guix/build/maven/pom.scm                     \
@@ -262,6 +262,7 @@ MODULES =                                   \
   guix/import/json.scm                         \
   guix/import/kde.scm                          \
   guix/import/launchpad.scm                    \
+  guix/import/minetest.scm                     \
   guix/import/opam.scm                         \
   guix/import/print.scm                                \
   guix/import/pypi.scm                         \
@@ -290,6 +291,7 @@ MODULES =                                   \
   guix/scripts/refresh.scm                     \
   guix/scripts/repl.scm                                \
   guix/scripts/describe.scm                    \
+  guix/scripts/style.scm                       \
   guix/scripts/system.scm                      \
   guix/scripts/system/search.scm               \
   guix/scripts/system/reconfigure.scm          \
@@ -304,6 +306,7 @@ MODULES =                                   \
   guix/scripts/import/go.scm                   \
   guix/scripts/import/hackage.scm              \
   guix/scripts/import/json.scm                 \
+  guix/scripts/import/minetest.scm             \
   guix/scripts/import/opam.scm                 \
   guix/scripts/import/pypi.scm                 \
   guix/scripts/import/stackage.scm             \
@@ -368,6 +371,10 @@ AUX_FILES =                                                \
   gnu/packages/aux-files/chromium/master-preferences.json              \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
   gnu/packages/aux-files/guix.vim                      \
+  gnu/packages/aux-files/linux-libre/5.14-arm.conf     \
+  gnu/packages/aux-files/linux-libre/5.14-arm64.conf   \
+  gnu/packages/aux-files/linux-libre/5.14-i686.conf    \
+  gnu/packages/aux-files/linux-libre/5.14-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/5.13-arm.conf     \
   gnu/packages/aux-files/linux-libre/5.13-arm64.conf   \
   gnu/packages/aux-files/linux-libre/5.13-i686.conf    \
@@ -392,6 +399,8 @@ AUX_FILES =                                         \
   gnu/packages/aux-files/linux-libre/4.4-i686.conf     \
   gnu/packages/aux-files/linux-libre/4.4-x86_64.conf   \
   gnu/packages/aux-files/pack-audit.c                  \
+  gnu/packages/aux-files/python/sanity-check.py                \
+  gnu/packages/aux-files/python/sitecustomize.py       \
   gnu/packages/aux-files/run-in-namespace.c
 
 # Templates, examples.
@@ -470,6 +479,7 @@ SCM_TESTS =                                 \
   tests/import-utils.scm                       \
   tests/inferior.scm                           \
   tests/lint.scm                               \
+  tests/minetest.scm                           \
   tests/modules.scm                            \
   tests/monads.scm                             \
   tests/nar.scm                                \
@@ -503,6 +513,7 @@ SCM_TESTS =                                 \
   tests/swh.scm                                \
   tests/syscalls.scm                           \
   tests/system.scm                             \
+  tests/style.scm                              \
   tests/texlive.scm                            \
   tests/transformations.scm                    \
   tests/ui.scm                                 \
@@ -514,6 +525,8 @@ SCM_TESTS =                                 \
 
 if HAVE_GUILE_LIB
 SCM_TESTS += tests/go.scm
+else
+EXTRA_DIST += tests/go.scm
 endif
 
 if BUILD_DAEMON_OFFLOAD
@@ -615,9 +628,11 @@ EXTRA_DIST +=                                              \
   .guix-authorizations                                 \
   .guix-channel                                                \
   scripts/guix.in                                      \
+  etc/disarchive-manifest.scm                          \
   etc/guix-install.sh                                  \
   etc/news.scm                                         \
   etc/release-manifest.scm                             \
+  etc/source-manifest.scm                              \
   etc/system-tests.scm                                 \
   etc/historical-authorizations                                \
   build-aux/build-self.scm                             \