summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-06-19 23:19:03 +0200
committerLudovic Courtès <ludo@gnu.org>2013-06-19 23:19:03 +0200
commitd516736c588cc793d8fe393c8b64f96712d2c977 (patch)
tree26faff10fb9c2d09f707e914cdd15fda4131e31f /Makefile.am
parent9af05aa29d740f753484a1c37a562f4da2c789c3 (diff)
build: Split Makefile.am into two parts.
* Makefile.am (MODULES): Move gnu/* to gnu-system.am. (patchdir, dist_patch_DATA, bootstrapdir, bootstrap_x86_64_linuxdir, bootstrap_i686_linuxdir, dist_bootstrap_x86_64_linux_DATA, dist_bootstrap_i686_linux_DATA, nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA, install-data-hook, DISTCLEANFILES, DOWNLOAD_FILE, gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Move to... * gnu-system.am: ... here. New file.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am242
1 files changed, 3 insertions, 239 deletions
diff --git a/Makefile.am b/Makefile.am
index 9d7ebf85e9..f39e571581 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,8 @@ nodist_noinst_SCRIPTS = \
pre-inst-env \
test-env
+include gnu-system.am
+
MODULES = \
guix/scripts/build.scm \
guix/scripts/download.scm \
@@ -66,152 +68,7 @@ MODULES = \
guix/packages.scm \
guix/snix.scm \
guix.scm \
- gnu/packages.scm \
- gnu/packages/acl.scm \
- gnu/packages/algebra.scm \
- gnu/packages/aspell.scm \
- gnu/packages/attr.scm \
- gnu/packages/autotools.scm \
- gnu/packages/avahi.scm \
- gnu/packages/base.scm \
- gnu/packages/bash.scm \
- gnu/packages/bdb.scm \
- gnu/packages/bdw-gc.scm \
- gnu/packages/bison.scm \
- gnu/packages/bootstrap.scm \
- gnu/packages/cdrom.scm \
- gnu/packages/cflow.scm \
- gnu/packages/check.scm \
- gnu/packages/cmake.scm \
- gnu/packages/compression.scm \
- gnu/packages/cpio.scm \
- gnu/packages/cppi.scm \
- gnu/packages/cross-base.scm \
- gnu/packages/cryptsetup.scm \
- gnu/packages/curl.scm \
- gnu/packages/cyrus-sasl.scm \
- gnu/packages/dejagnu.scm \
- gnu/packages/ddrescue.scm \
- gnu/packages/dwm.scm \
- gnu/packages/ed.scm \
- gnu/packages/emacs.scm \
- gnu/packages/fdisk.scm \
- gnu/packages/file.scm \
- gnu/packages/flex.scm \
- gnu/packages/fontutils.scm \
- gnu/packages/freeipmi.scm \
- gnu/packages/gawk.scm \
- gnu/packages/gcal.scm \
- gnu/packages/gcc.scm \
- gnu/packages/gd.scm \
- gnu/packages/gdb.scm \
- gnu/packages/gdbm.scm \
- gnu/packages/gettext.scm \
- gnu/packages/ghostscript.scm \
- gnu/packages/glib.scm \
- gnu/packages/global.scm \
- gnu/packages/gnupg.scm \
- gnu/packages/gnutls.scm \
- gnu/packages/gperf.scm \
- gnu/packages/gprolog.scm \
- gnu/packages/graphviz.scm \
- gnu/packages/groff.scm \
- gnu/packages/grub.scm \
- gnu/packages/grue-hunter.scm \
- gnu/packages/gsasl.scm \
- gnu/packages/gtk.scm \
- gnu/packages/guile.scm \
- gnu/packages/gv.scm \
- gnu/packages/help2man.scm \
- gnu/packages/hugs.scm \
- gnu/packages/icu4c.scm \
- gnu/packages/idutils.scm \
- gnu/packages/imagemagick.scm \
- gnu/packages/indent.scm \
- gnu/packages/irssi.scm \
- gnu/packages/ld-wrapper.scm \
- gnu/packages/less.scm \
- gnu/packages/lesstif.scm \
- gnu/packages/libapr.scm \
- gnu/packages/libdaemon.scm \
- gnu/packages/libevent.scm \
- gnu/packages/libffi.scm \
- gnu/packages/libidn.scm \
- gnu/packages/libjpeg.scm \
- gnu/packages/libphidget.scm \
- gnu/packages/libpng.scm \
- gnu/packages/libsigsegv.scm \
- gnu/packages/libtiff.scm \
- gnu/packages/libunistring.scm \
- gnu/packages/libusb.scm \
- gnu/packages/libunwind.scm \
- gnu/packages/linux.scm \
- gnu/packages/linux-initrd.scm \
- gnu/packages/lout.scm \
- gnu/packages/lsh.scm \
- gnu/packages/lsof.scm \
- gnu/packages/lua.scm \
- gnu/packages/lvm.scm \
- gnu/packages/m4.scm \
- gnu/packages/mailutils.scm \
- gnu/packages/make-bootstrap.scm \
- gnu/packages/mit-krb5.scm \
- gnu/packages/mp3.scm \
- gnu/packages/multiprecision.scm \
- gnu/packages/mysql.scm \
- gnu/packages/nano.scm \
- gnu/packages/ncurses.scm \
- gnu/packages/netpbm.scm \
- gnu/packages/nettle.scm \
- gnu/packages/ocaml.scm \
- gnu/packages/oggvorbis.scm \
- gnu/packages/openldap.scm \
- gnu/packages/openssl.scm \
- gnu/packages/parted.scm \
- gnu/packages/patchelf.scm \
- gnu/packages/pcre.scm \
- gnu/packages/pdf.scm \
- gnu/packages/perl.scm \
- gnu/packages/pkg-config.scm \
- gnu/packages/plotutils.scm \
- gnu/packages/popt.scm \
- gnu/packages/pth.scm \
- gnu/packages/python.scm \
- gnu/packages/qemu.scm \
- gnu/packages/ratpoison.scm \
- gnu/packages/readline.scm \
- gnu/packages/recutils.scm \
- gnu/packages/rsync.scm \
- gnu/packages/samba.scm \
- gnu/packages/scheme.scm \
- gnu/packages/screen.scm \
- gnu/packages/shishi.scm \
- gnu/packages/smalltalk.scm \
- gnu/packages/sqlite.scm \
- gnu/packages/ssh.scm \
- gnu/packages/system.scm \
- gnu/packages/tcl.scm \
- gnu/packages/tcsh.scm \
- gnu/packages/texinfo.scm \
- gnu/packages/texlive.scm \
- gnu/packages/time.scm \
- gnu/packages/tmux.scm \
- gnu/packages/tor.scm \
- gnu/packages/unrtf.scm \
- gnu/packages/version-control.scm \
- gnu/packages/vim.scm \
- gnu/packages/vpn.scm \
- gnu/packages/w3m.scm \
- gnu/packages/wdiff.scm \
- gnu/packages/wget.scm \
- gnu/packages/which.scm \
- gnu/packages/wordnet.scm \
- gnu/packages/xlockmore.scm \
- gnu/packages/xml.scm \
- gnu/packages/xorg.scm \
- gnu/packages/zile.scm \
- gnu/packages/zip.scm \
- gnu/system/vm.scm
+ $(GNU_SYSTEM_MODULES)
# Because of the autoload hack in (guix build download), we must build it
# first to avoid errors on systems where (gnutls) is unavailable.
@@ -221,99 +78,6 @@ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
nobase_dist_guilemodule_DATA = $(MODULES)
-patchdir = $(guilemoduledir)/gnu/packages/patches
-dist_patch_DATA = \
- gnu/packages/patches/automake-skip-amhello-tests.patch \
- gnu/packages/patches/bigloo-gc-shebangs.patch \
- gnu/packages/patches/binutils-ld-new-dtags.patch \
- gnu/packages/patches/cmake-fix-tests.patch \
- gnu/packages/patches/cpio-gets-undeclared.patch \
- gnu/packages/patches/diffutils-gets-undeclared.patch \
- gnu/packages/patches/emacs-configure-sh.patch \
- gnu/packages/patches/findutils-absolute-paths.patch \
- gnu/packages/patches/flac-fix-memcmp-not-declared.patch \
- gnu/packages/patches/flex-bison-tests.patch \
- gnu/packages/patches/gawk-shell.patch \
- gnu/packages/patches/gcc-cross-environment-variables.patch \
- gnu/packages/patches/gettext-gets-undeclared.patch \
- gnu/packages/patches/glib-tests-desktop.patch \
- gnu/packages/patches/glib-tests-homedir.patch \
- gnu/packages/patches/glib-tests-prlimit.patch \
- gnu/packages/patches/glibc-bootstrap-system.patch \
- gnu/packages/patches/glibc-no-ld-so-cache.patch \
- gnu/packages/patches/grub-gets-undeclared.patch \
- gnu/packages/patches/guile-1.8-cpp-4.5.patch \
- gnu/packages/patches/guile-default-utf8.patch \
- gnu/packages/patches/guile-linux-syscalls.patch \
- gnu/packages/patches/guile-relocatable.patch \
- gnu/packages/patches/libapr-skip-getservbyname-test.patch \
- gnu/packages/patches/libevent-dns-tests.patch \
- gnu/packages/patches/libtool-skip-tests.patch \
- gnu/packages/patches/lsh-guile-compat.patch \
- gnu/packages/patches/lsh-no-root-login.patch \
- gnu/packages/patches/lsh-pam-service-name.patch \
- gnu/packages/patches/m4-gets-undeclared.patch \
- gnu/packages/patches/m4-readlink-EINVAL.patch \
- gnu/packages/patches/m4-s_isdir.patch \
- gnu/packages/patches/make-impure-dirs.patch \
- gnu/packages/patches/mcron-install.patch \
- gnu/packages/patches/perl-no-sys-dirs.patch \
- gnu/packages/patches/python-fix-dbm.patch \
- gnu/packages/patches/procps-make-3.82.patch \
- gnu/packages/patches/qemu-multiple-smb-shares.patch \
- gnu/packages/patches/readline-link-ncurses.patch \
- gnu/packages/patches/scheme48-tests.patch \
- gnu/packages/patches/tar-gets-undeclared.patch \
- gnu/packages/patches/tcsh-fix-autotest.patch \
- gnu/packages/patches/teckit-cstdio.patch \
- gnu/packages/patches/vpnc-script.patch \
- gnu/packages/patches/w3m-fix-compile.patch \
- gnu/packages/patches/xpdf-constchar.patch
-
-bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
-bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
-bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
-
-dist_bootstrap_x86_64_linux_DATA = \
- gnu/packages/bootstrap/x86_64-linux/bash \
- gnu/packages/bootstrap/x86_64-linux/mkdir \
- gnu/packages/bootstrap/x86_64-linux/tar \
- gnu/packages/bootstrap/x86_64-linux/xz
-
-dist_bootstrap_i686_linux_DATA = \
- gnu/packages/bootstrap/i686-linux/bash \
- gnu/packages/bootstrap/i686-linux/mkdir \
- gnu/packages/bootstrap/i686-linux/tar \
- gnu/packages/bootstrap/i686-linux/xz
-
-# Big bootstrap binaries are not included in the tarball. Instead, they
-# are downloaded.
-nodist_bootstrap_x86_64_linux_DATA = \
- gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
-nodist_bootstrap_i686_linux_DATA = \
- gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
-
-# Those files must remain executable, so they remain executable once
-# imported into the store.
-install-data-hook:
- chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
-
-DISTCLEANFILES = \
- $(nodist_bootstrap_x86_64_linux_DATA) \
- $(nodist_bootstrap_i686_linux_DATA)
-
-# Method to download a file from an external source.
-DOWNLOAD_FILE = \
- GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
- $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \
- "$(top_srcdir)/build-aux/download.scm"
-
-gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"
-gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
- $(MKDIR_P) `dirname "$@"`
- $(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"
nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm