summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-03-24 05:51:10 -0600
committerJim Meyering <meyering@redhat.com>2008-03-25 21:56:39 +0100
commit5f2ea441ac7eb7ace61e1ae422c5ae9165f02258 (patch)
tree6bddca80b12d56ec6d506b27e42d564298390eff /Makefile.am
parentda9f5e7fdffbb31f5c5949d5f931e757aa65e7c7 (diff)
downloadcoreutils-5f2ea441ac7eb7ace61e1ae422c5ae9165f02258.tar.xz
Use new gnulib gnumakefile module.
* bootstrap.conf (gnulib_modules): Pull in new module. * GNUmakefile: Remove from version control. * .gitignore: Update. * configure.ac (AC_CONFIG_LINKS): Delete; rely on gnulib to do this now. * Makefile.am (EXTRA_DIST, distclean-local): Likewise. Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am7
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index e7fc1189f..91ce28491 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = lib src doc man po tests gnulib-tests
-EXTRA_DIST = cfg.mk maint.mk GNUmakefile \
+EXTRA_DIST = cfg.mk maint.mk \
.prev-version THANKS-to-translators THANKStt.in \
.version \
.vg-suppressions \
@@ -94,11 +94,6 @@ gen-ChangeLog:
distcheck-hook: check-ls-dircolors
$(MAKE) my-distcheck
-# Arrange to remove the symlink to GNUmakefile in VPATH builds.
-# TODO remove this once automake vs. AC_CONFIG_LINKS issue is fixed.
-distclean-local:
- if test x"$(VPATH)" != x ; then rm -f GNUmakefile ; fi
-
DISTCLEANFILES = VERSION
MAINTAINERCLEANFILES = THANKS-to-translators
THANKS-to-translators: po/LINGUAS THANKStt.in