diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | GNUmakefile | 86 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | bootstrap.conf | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
5 files changed, 4 insertions, 107 deletions
diff --git a/.gitignore b/.gitignore index b5c507eb8..c5d7a01a7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .version ABOUT-NLS ChangeLog +GNUmakefile ID INSTALL Makefile @@ -50,6 +51,7 @@ lib/libcoreutils.a lib/printf.c lib/progname.c lib/progname.h +lib/selinux m4/.cvsignore m4/.gitignore po/*.gmo diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 38dd1262f..000000000 --- a/GNUmakefile +++ /dev/null @@ -1,86 +0,0 @@ -# Having a separate GNUmakefile lets me `include' the dynamically -# generated rules created via cfg.mk (package-local configuration) -# as well as maint.mk (generic maintainer rules). -# This makefile is used only if you run GNU Make. -# It is necessary if you want to build targets usually of interest -# only to the maintainer. - -# Copyright (C) 2001, 2003, 2006-2008 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 published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Systems where /bin/sh is not the default shell need this. The $(shell) -# command below won't work with e.g. stock DOS/Windows shells. -ifeq ($(wildcard /bin/s[h]),/bin/sh) -SHELL = /bin/sh -else -# will be used only with the next shell-test line, then overwritten -# by a configured-in value -SHELL = sh -endif - -# If the user runs GNU make but has not yet run ./configure, -# give them a diagnostic. -_have-Makefile := $(shell test -f Makefile && echo yes) -ifeq ($(_have-Makefile),yes) - -# Make tar archive easier to reproduce. -export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner - -include Makefile - -# Some projects override e.g., _autoreconf here. --include $(srcdir)/cfg.mk -include $(srcdir)/maint.mk - -# Allow cfg.mk to override these. -_build-aux ?= build-aux -_autoreconf ?= autoreconf - -# Ensure that $(VERSION) is up to date for dist-related targets, but not -# for others: rerunning autoreconf and recompiling everything isn't cheap. -_have-git-version-gen := \ - $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes) -ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) - _is-dist-target = $(filter-out %clean, \ - $(filter dist% alpha beta major,$(MAKECMDGOALS))) - ifneq (,$(_is-dist-target)) - _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ - $(srcdir)/.tarball-version) - ifneq ($(_curr-ver),$(VERSION)) - $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && $(_autoreconf))) - endif - endif -endif - -else - -.DEFAULT_GOAL := abort-due-to-no-makefile - -# The package can override .DEFAULT_GOAL to run actions like autoreconf. --include ./cfg.mk -include ./maint.mk - -abort-due-to-no-makefile: - @echo There seems to be no Makefile in this directory. 1>&2 - @echo "You must run ./configure before running \`make'." 1>&2 - @exit 1 - -endif - -# Tell version 3.79 and up of GNU make to not build goals in this -# directory in parallel. This is necessary in case someone tries to -# build multiple targets on one command line. -.NOTPARALLEL: 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 diff --git a/bootstrap.conf b/bootstrap.conf index 452c67b30..8bde0ad0e 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -57,7 +57,7 @@ gnulib_modules=" gettext gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog - gnu-make gnupload + gnu-make gnumakefile gnupload group-member hard-locale hash hash-pjw host-os human idcache inttostr inttypes isapipe lchmod lchown lib-ignore linebuffer link-follow diff --git a/configure.ac b/configure.ac index 14505fc52..0e101a14a 100644 --- a/configure.ac +++ b/configure.ac @@ -334,20 +334,6 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) AM_GNU_GETTEXT([external], [need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([0.15]) -dnl Allow maintainer rules under GNU make even in VPATH builds. This does -dnl not work in autoconf 2.61 or earlier, but we don't want to require -dnl non-maintainers to use unreleased autoconf, hence the version test. -dnl TODO remove the version check once autoconf 2.62 is released. -dnl Meanwhile, we must use a shell variable so that we bypass automake's -dnl attempts to remove the sole copy of GNUmakefile in a non-VPATH build -dnl during 'make distclean'. -dnl TODO avoid the shell variable once automake is fixed. -GNUmakefile=GNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=$GNUmakefile])]) - AC_CONFIG_FILES( Makefile doc/Makefile |