From: Bruno Haible Date: Sat, 30 Mar 2019 10:45:00 +0000 (+0100) Subject: build: Move the Emacs package sources to subdirectory gettext-tools/emacs/. X-Git-Tag: v0.20~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=482aeabfa7586fbb3264cab72abce7441f2eb53a;p=thirdparty%2Fgettext.git build: Move the Emacs package sources to subdirectory gettext-tools/emacs/. * gettext-tools/emacs/*.el: Moved here from gettext-tools/misc/. * gettext-tools/emacs/Makefile.am: New file, based on gettext-tools/misc/Makefile.am. * gettext-tools/misc/Makefile.am (lisp_LISP): Remove variable. * gettext-tools/configure.ac (AC_CONFIG_FILES): Add emacs/Makefile. * gettext-tools/Makefile.am (SUBDIRS): Add 'emacs'. --- diff --git a/.gitignore b/.gitignore index 2995a02a8..59a18b367 100644 --- a/.gitignore +++ b/.gitignore @@ -336,6 +336,7 @@ /gettext-tools/config.h.in /gettext-tools/Makefile.in /gettext-tools/doc/Makefile.in +/gettext-tools/emacs/Makefile.in /gettext-tools/examples/aclocal.m4 /gettext-tools/examples/configure /gettext-tools/examples/Makefile.in @@ -396,6 +397,7 @@ /gettext-tools/doc/gettext_foot.html /gettext-tools/doc/gettext_[0-9].html /gettext-tools/doc/gettext_[0-9][0-9].html +/gettext-tools/emacs/*.elc /gettext-tools/examples/po/gettext-examples.pot /gettext-tools/examples/po/stamp-po /gettext-tools/man/autopoint.1 @@ -435,7 +437,6 @@ /gettext-tools/man/xgettext.1 /gettext-tools/man/xgettext.1.html /gettext-tools/misc/archive.*.tar.* -/gettext-tools/misc/*.elc /gettext-tools/po/gettext-tools.pot /gettext-tools/po/stamp-po # Files generated by "make", using gperf: @@ -530,6 +531,7 @@ autom4te.cache/ /gettext-tools/libtool /gettext-tools/stamp-h1 /gettext-tools/doc/Makefile +/gettext-tools/emacs/Makefile /gettext-tools/examples/Makefile /gettext-tools/examples/installpaths /gettext-tools/examples/po/Makefile diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index f5b138107..449a79754 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools directory of GNU gettext -## Copyright (C) 1995-2007, 2010, 2013-2016, 2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2007, 2010, 2013-2016, 2018-2019 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 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles misc man m4 tests system-tests gnulib-tests examples doc +SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc EXTRA_DIST = misc/DISCLAIM MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 9993596cc..271892d14 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-tools directory of GNU gettext -dnl Copyright (C) 1995-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2019 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -531,6 +531,8 @@ AC_CONFIG_FILES([projects/Makefile]) AC_CONFIG_FILES([styles/Makefile]) +AC_CONFIG_FILES([emacs/Makefile]) + AC_CONFIG_FILES([misc/Makefile]) AC_CONFIG_FILES([misc/gettextize], [chmod a+x misc/gettextize]) AC_CONFIG_FILES([misc/autopoint], [chmod a+x misc/autopoint]) diff --git a/gettext-tools/emacs/Makefile.am b/gettext-tools/emacs/Makefile.am new file mode 100644 index 000000000..c80aa4c3e --- /dev/null +++ b/gettext-tools/emacs/Makefile.am @@ -0,0 +1,31 @@ +## Makefile for the gettext-tools/emacs subdirectory of GNU gettext +## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010, 2019 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 . + +## Process this file with automake to produce Makefile.in. + +AUTOMAKE_OPTIONS = 1.2 gnits +EXTRA_DIST = +MOSTLYCLEANFILES = +CLEANFILES = +DISTCLEANFILES = + + +# Emacs Lisp code. + +lisp_LISP = start-po.el po-mode.el po-compat.el + +EXTRA_DIST += $(lisp_LISP) diff --git a/gettext-tools/misc/po-compat.el b/gettext-tools/emacs/po-compat.el similarity index 100% rename from gettext-tools/misc/po-compat.el rename to gettext-tools/emacs/po-compat.el diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/emacs/po-mode.el similarity index 100% rename from gettext-tools/misc/po-mode.el rename to gettext-tools/emacs/po-mode.el diff --git a/gettext-tools/misc/start-po.el b/gettext-tools/emacs/start-po.el similarity index 100% rename from gettext-tools/misc/start-po.el rename to gettext-tools/emacs/start-po.el diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am index 99a891ce1..1aa4732f2 100644 --- a/gettext-tools/misc/Makefile.am +++ b/gettext-tools/misc/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/misc subdirectory of GNU gettext -## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010 Free +## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010, 2019 Free ## Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify @@ -113,9 +113,3 @@ archive.cvs.tar.gz: archive.dir.tar inputfile='$(srcdir)'/archive.dir.tar; \ fi; \ ./convert-archive dir cvs "$$inputfile" $@ - -# Emacs Lisp code. - -lisp_LISP = start-po.el po-mode.el po-compat.el - -EXTRA_DIST += $(lisp_LISP)