[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/17] build: no more recursion for 'lib/emacs' subdir
From: |
Stefano Lattarini |
Subject: |
[PATCH v2 05/17] build: no more recursion for 'lib/emacs' subdir |
Date: |
Mon, 6 May 2013 15:21:12 +0200 |
* lib/emacs/Makefile.am: Delete, its contents merged ...
* lib/Makefile.am: ... in here, with proper adjustments.
(SUBDIRS): Drop 'emacs'.
* configure.ac (AC_CONFIG_FILES): Drop 'lib/emacs/Makefile'.
Signed-off-by: Stefano Lattarini <address@hidden>
---
configure.ac | 1 -
lib/Makefile.am | 10 +++++++++-
lib/emacs/Makefile.am | 3 ---
3 files changed, 9 insertions(+), 5 deletions(-)
delete mode 100644 lib/emacs/Makefile.am
diff --git a/configure.ac b/configure.ac
index 1fc00ae..c6aa0c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,6 @@ AC_SUBST([PERL_FLOCK], [$ac_cv_perl_flock_implemented])
## Emacs. ##
## ------- ##
-AC_CONFIG_FILES([lib/emacs/Makefile])
TEST_EMACS=$EMACS
test x"$TEST_EMACS" = xt && TEST_EMACS=
AC_CHECK_PROGS([TEST_EMACS], [emacs xemacs], [no])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index df1dc9a..23128bb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS = Autom4te m4sugar autoconf autotest autoscan emacs
+SUBDIRS = Autom4te m4sugar autoconf autotest autoscan
nodist_pkgdata_DATA = autom4te.cfg
EXTRA_DIST = autom4te.in
@@ -42,3 +42,11 @@ autom4te.cfg: $(srcdir)/autom4te.in Makefile
$(edit) $(srcdir)/autom4te.in >autom4te.tmp
chmod a-w autom4te.tmp
mv autom4te.tmp autom4te.cfg
+
+# Make Autoconf Emacs library.
+dist_lisp_LISP = emacs/autoconf-mode.el emacs/autotest-mode.el
+
+# TODO: This is required to work around a limitation in older
+# Automake. Remove once we can assume Automake 1.13 or later.
+CLEANFILES += autoconf-mode.elc autotest-mode.elc
+
diff --git a/lib/emacs/Makefile.am b/lib/emacs/Makefile.am
deleted file mode 100644
index aa62207..0000000
--- a/lib/emacs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# Make Autoconf Emacs library.
-
-dist_lisp_LISP = autoconf-mode.el autotest-mode.el
--
1.8.3.rc0.19.g7e6a0cc
- [PATCH 13/16] build: avoid repeating the same etags args several times, (continued)
- [PATCH 13/16] build: avoid repeating the same etags args several times, Stefano Lattarini, 2013/05/05
- [PATCH 14/16] build: fixup: don't define ETAGS_ARGS multiple times, Stefano Lattarini, 2013/05/05
- [PATCH 12/16] build: no more recursion for lib subdir, Stefano Lattarini, 2013/05/05
- [PATCH 16/16] build: remove last make recursion (for subdir 'man'), Stefano Lattarini, 2013/05/05
- [PATCH 15/16] build: no more recursion for tests subdir, Stefano Lattarini, 2013/05/05
- Re: [RFC] Convert the Autoconf build system to non-recursive make, Paul Eggert, 2013/05/05
- Re: [RFC] Convert the Autoconf build system to non-recursive make, Stefano Lattarini, 2013/05/06
- [PATCH v2 00/17] Convert the autoconf build system to non-recursive make, Stefano Lattarini, 2013/05/06
- [PATCH v2 02/17] build: don't distribute lib/freeze.mk explicitly, Stefano Lattarini, 2013/05/06
- [PATCH v2 01/17] sync: some files from upstream, Stefano Lattarini, 2013/05/06
- [PATCH v2 05/17] build: no more recursion for 'lib/emacs' subdir,
Stefano Lattarini <=
- [PATCH v2 04/17] build: no more make recursion for 'bin' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 03/17] build: no more make recursion for 'doc' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 06/17] build: no more recursion for 'lib/autoscan' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 07/17] build: no more recursion for 'lib/autotest' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 09/17] build: no more recursion for' lib/autoconf' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 10/17] build: no more recursion for 'lib/Autom4te' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 08/17] build: no more recursion for 'lib/m4sugar' subdir, Stefano Lattarini, 2013/05/06
- [PATCH v2 11/17] build: define RELEASE_YEAR with AC_SUBST, Stefano Lattarini, 2013/05/06
- [PATCH v2 13/17] build: avoid repeating the same etags args several times, Stefano Lattarini, 2013/05/06
- [PATCH v2 12/17] build: no more recursion for lib 'subdir', Stefano Lattarini, 2013/05/06