diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /Makefile | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,6 @@ # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, -# 2006, 2009 Free Software Foundation, Inc. +# 2006, 2009, 2011 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -21,7 +21,7 @@ makemode := misc include ./Makeconf -DIST_FILES = COPYING Makeconf config.make.in configure.in configure \ +DIST_FILES = ChangeLog COPYING Makeconf config.make.in configure.in configure \ move-if-change hurd.boot build.mk.in build.mkcf.in aclocal.m4 \ README NEWS tasks INSTALL INSTALL-cross version.h.in @@ -35,13 +35,17 @@ lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ # Hurd programs prog-subdirs = auth proc exec init term \ - ufs ext2fs isofs nfs tmpfs fatfs \ + ufs ext2fs isofs tmpfs fatfs \ storeio pflocal pfinet defpager mach-defpager \ - login daemons nfsd boot console \ + login daemons boot console \ hostmux usermux ftpfs trans \ console-client utils sutils ufs-fsck ufs-utils \ benchmarks fstests +ifeq ($(HAVE_SUN_RPC),yes) +prog-subdirs += nfs nfsd +endif + # Other directories other-subdirs = hurd doc config release include |