# HG changeset patch # User Simon Josefsson # Date 1139921575 0 # Node ID f86aa960142e47dda2b54c534745168c5a429690 # Parent 45f5aa25f015d7c2e7c62c6ad52a7300d2fc6bd7 * build-aux/GNUmakefile: Rename Makefile.maint to maint.mk and (the local) Makefile.cfg to maint-cfg.mk. * build-aux/Makefile.maint, build-aux/maint.mk: Renamed the former to the latter. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-02-14 Simon Josefsson + * build-aux/GNUmakefile: Rename Makefile.maint to maint.mk + and (the local) Makefile.cfg to maint-cfg.mk. + + * build-aux/Makefile.maint, build-aux/maint.mk: Renamed the former + to the latter. + * modules/maintainer-makefile: New module. * build-aux/Makefile.maint: New file, from GNU CoreUtils, although diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile --- a/build-aux/GNUmakefile +++ b/build-aux/GNUmakefile @@ -38,15 +38,15 @@ ifeq ($(have-Makefile),yes) include Makefile --include $(srcdir)/Makefile.cfg -include $(srcdir)/Makefile.maint +-include $(srcdir)/maint-cfg.mk +include $(srcdir)/maint.mk else .DEFAULT_GOAL := abort-due-to-no-makefile --include ./Makefile.cfg -include ./Makefile.maint +-include ./maint-cfg.mk +include ./maint.mk abort-due-to-no-makefile: @echo There seems to be no Makefile in this directory. 1>&2 diff --git a/build-aux/Makefile.maint b/build-aux/Makefile.maint deleted file mode 100644 --- a/build-aux/Makefile.maint +++ /dev/null @@ -1,44 +0,0 @@ -# -*-Makefile-*- -# This Makefile fragment is intended to be useful by any GNU-like project. -# This file originate from coreutils, CPPI, Bison, and Autoconf. - -## Copyright (C) 2001-2006 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 2, 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -## 02110-1301, USA. - -# List of all C-like source code files that will be tested for -# stylistic "errors". You may want to define this to something -# more complex in Makefile.cfg. -C_SOURCES ?= $(shell find . -name '*.[chly]') - -# Add some more files to check, typically set in Makefile.cfg. -C_SOURCES += $(C_SOURCES_ADD) - -# Do not save the original name or timestamp in the .tar.gz file. -# Use --rsyncable if available. -gzip_rsyncable := \ - $(shell gzip --help|grep rsyncable >/dev/null && echo --rsyncable) -GZIP_ENV = '--no-name --best $(gzip_rsyncable)' - -# Prevent programs like 'sort' from considering distinct strings to be equal. -# Doing it here saves us from having to set LC_ALL elsewhere in this file. -export LC_ALL = C - -# Casting arguments to free is never necessary. -sc_cast_of_argument_to_free: - @grep -nE '\&2; \ - exit 1; } || : diff --git a/build-aux/maint.mk b/build-aux/maint.mk new file mode 100644 --- /dev/null +++ b/build-aux/maint.mk @@ -0,0 +1,44 @@ +# -*-Makefile-*- +# This Makefile fragment is intended to be useful by any GNU-like project. +# This file originate from coreutils, CPPI, Bison, and Autoconf. + +## Copyright (C) 2001-2006 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 2, 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, write to the Free Software +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. + +# List of all C-like source code files that will be tested for +# stylistic "errors". You may want to define this to something +# more complex in Makefile.cfg. +C_SOURCES ?= $(shell find . -name '*.[chly]') + +# Add some more files to check, typically set in Makefile.cfg. +C_SOURCES += $(C_SOURCES_ADD) + +# Do not save the original name or timestamp in the .tar.gz file. +# Use --rsyncable if available. +gzip_rsyncable := \ + $(shell gzip --help|grep rsyncable >/dev/null && echo --rsyncable) +GZIP_ENV = '--no-name --best $(gzip_rsyncable)' + +# Prevent programs like 'sort' from considering distinct strings to be equal. +# Doing it here saves us from having to set LC_ALL elsewhere in this file. +export LC_ALL = C + +# Casting arguments to free is never necessary. +sc_cast_of_argument_to_free: + @grep -nE '\&2; \ + exit 1; } || :