aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2013-04-04 18:48:24 +0200
committerAndreas Enge <andreas@enge.fr>2013-04-04 18:49:28 +0200
commit6be960c7f7f8538024f5807dcd5b6a8a7562baf1 (patch)
tree05a6712b7e8aa0fe2b4314767dc0219e85ea695e /Makefile.am
parent9be8d7c8cb1b1ee4d1f3ba7360320527199b4a0d (diff)
parent8dc5d0cf7e18ee423c73087570c6b50d215ae216 (diff)
downloadguix-6be960c7f7f8538024f5807dcd5b6a8a7562baf1.tar
guix-6be960c7f7f8538024f5807dcd5b6a8a7562baf1.tar.gz
Merge branch 'xorg' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 89a8571019..053dc1e8c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,6 +108,7 @@ MODULES = \
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 \
@@ -177,6 +178,7 @@ MODULES = \
gnu/packages/wget.scm \
gnu/packages/which.scm \
gnu/packages/xml.scm \
+ gnu/packages/xorg.scm \
gnu/packages/zile.scm \
gnu/packages/zip.scm \
gnu/system/vm.scm
@@ -235,7 +237,8 @@ dist_patch_DATA = \
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/w3m-fix-compile.patch \
+ gnu/packages/patches/xpdf-constchar.patch
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux