From faacecdc439685bac185269e48fcf6ab0eb8e886 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sat, 2 Jan 2016 18:35:51 +0900 Subject: maint: Use maintainer-makefile from gnulib * autogen.sh: Pull GNUmakefile, maint.mk, and dependency scripts in build-aux. * cfg.mk (update-copyright-env): Adjust for gettext. * .x-update-copyright: New file. * .gitignore: Ignore files brought in by gnulib-tool. --- .gitignore | 6 ++++++ .x-update-copyright | 14 ++++++++++++++ autogen.sh | 7 ++++++- cfg.mk | 5 +++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .x-update-copyright create mode 100644 cfg.mk diff --git a/.gitignore b/.gitignore index 2fdf4f6..c784122 100644 --- a/.gitignore +++ b/.gitignore @@ -43,8 +43,14 @@ Makefile /gettext-tools/examples/ChangeLog /gettext-tools/po/ChangeLog +# Files brought in by gnulib-tool: +/GNUmakefile /build-aux/ar-lib /build-aux/git-version-gen /build-aux/gitlog-to-changelog /build-aux/snippet /build-aux/test-driver +/build-aux/update-copyright +/build-aux/useless-if-before-free +/build-aux/vc-list-files +/maint.mk diff --git a/.x-update-copyright b/.x-update-copyright new file mode 100644 index 0000000..cb63ac9 --- /dev/null +++ b/.x-update-copyright @@ -0,0 +1,14 @@ +COPYING$ +COPYING.LIB$ +.*\.po$ +^build-aux/ltmain\.sh$ +^build-aux/texinfo\.tex$ +^m4/lt.*\.m4$ +^m4/libtool\.m4$ +^gettext-runtime/intl/localcharset\.[ch]$ +^gettext-runtime/intl/config\.charset$ +^gettext-runtime/intl/locale\.alias$ +^gettext-tools/doc/gpl\.texi$ +^gettext-tools/doc/lgpl\.texi$ +^gettext-tools/doc/fdl\.texi$ +^gettext-tools/examples/hello-c++-kde/admin/.*$ diff --git a/autogen.sh b/autogen.sh index 604a059..61a1ee5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 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 @@ -380,6 +380,11 @@ if ! $skip_gnulib; then $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $? $GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $? $GNULIB_TOOL --copy-file build-aux/gitlog-to-changelog || exit $? + $GNULIB_TOOL --copy-file build-aux/update-copyright || exit $? + $GNULIB_TOOL --copy-file build-aux/useless-if-before-free || exit $? + $GNULIB_TOOL --copy-file build-aux/vc-list-files || exit $? + $GNULIB_TOOL --copy-file top/GNUmakefile . || exit $? + $GNULIB_TOOL --copy-file top/maint.mk . || exit $? fi fi diff --git a/cfg.mk b/cfg.mk new file mode 100644 index 0000000..71cebca --- /dev/null +++ b/cfg.mk @@ -0,0 +1,5 @@ +SED ?= sed + +update-copyright-env = \ + UPDATE_COPYRIGHT_USE_INTERVALS=1 \ + UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 -- cgit v1.1