[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/16] build: no more recursion for lib/Autom4te subdir
From: |
Stefano Lattarini |
Subject: |
[PATCH 10/16] build: no more recursion for lib/Autom4te subdir |
Date: |
Sun, 5 May 2013 23:29:07 +0200 |
Signed-off-by: Stefano Lattarini <address@hidden>
---
configure.ac | 4 +---
lib/Autom4te/Makefile.am | 37 -------------------------------------
lib/Makefile.am | 20 +++++++++++++++++++-
3 files changed, 20 insertions(+), 41 deletions(-)
delete mode 100644 lib/Autom4te/Makefile.am
diff --git a/configure.ac b/configure.ac
index f045af9..b3f3fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,9 +206,7 @@ AC_PROG_MAKE_CASE_SENSITIVE
dnl Allow maintainer rules under GNU make even in VPATH builds.
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
-AC_CONFIG_FILES([Makefile
- lib/Makefile lib/Autom4te/Makefile
- ])
+AC_CONFIG_FILES([Makefile lib/Makefile])
AC_OUTPUT
# Report the state of this version of Autoconf if this is a beta.
diff --git a/lib/Autom4te/Makefile.am b/lib/Autom4te/Makefile.am
deleted file mode 100644
index 4a2c6bf..0000000
--- a/lib/Autom4te/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2001, 2003, 2009-2013 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/>.
-
-perllibdir = $(pkgdatadir)/Autom4te
-dist_perllib_DATA = \
- C4che.pm \
- ChannelDefs.pm \
- Channels.pm \
- Configure_ac.pm \
- FileUtils.pm \
- General.pm \
- Getopt.pm \
- Request.pm \
- XFile.pm
-
-
-## --------------- ##
-## Building TAGS. ##
-## --------------- ##
-
-TAGS_FILES = $(dist_perllib_DATA)
-
-ETAGS_ARGS = --lang=perl
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5dedc67..1004622 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,7 +27,25 @@ check-local: check-forbidden-patterns
forbidden_patterns = -e '^_*EOF' -e ' cmp '
forbidden_patterns_files = # Incrementally updated later.
-SUBDIRS = Autom4te
+## ---------------------------------------------------------------- ##
+## Auxiliary perl modules used by autom4te and other perl scripts. ##
+## ---------------------------------------------------------------- ##
+
+perllibdir = $(pkgdatadir)/Autom4te
+
+dist_perllib_DATA = \
+ Autom4te/C4che.pm \
+ Autom4te/ChannelDefs.pm \
+ Autom4te/Channels.pm \
+ Autom4te/Configure_ac.pm \
+ Autom4te/FileUtils.pm \
+ Autom4te/General.pm \
+ Autom4te/Getopt.pm \
+ Autom4te/Request.pm \
+ Autom4te/XFile.pm
+
+TAGS_FILES += $(dist_perllib_DATA)
+ETAGS_ARGS += --lang=perl
## ------------------------------------------ ##
## Make Autom4te default configuration file. ##
--
1.8.3.rc0.19.g7e6a0cc
- [RFC] Convert the Autoconf build system to non-recursive make, Stefano Lattarini, 2013/05/05
- [PATCH 02/16] build: don't distribute lib/freeze.mk explicitly, Stefano Lattarini, 2013/05/05
- [PATCH 03/16] build: no more make recursion for 'doc' subdir, Stefano Lattarini, 2013/05/05
- [PATCH 01/16] sync: some files from upstream, Stefano Lattarini, 2013/05/05
- [PATCH 05/16] build: no more recursion for lib/emacs subdir, Stefano Lattarini, 2013/05/05
- [PATCH 04/16] build: no more make recursion for 'bin' subdir, Stefano Lattarini, 2013/05/05
- [PATCH 06/16] build: no more recursion for lib/autoscan subdir, Stefano Lattarini, 2013/05/05
- [PATCH 07/16] build: no more recursion for lib/autotest subdir, Stefano Lattarini, 2013/05/05
- [PATCH 08/16] build: no more recursion for lib/m4sugar subdir, Stefano Lattarini, 2013/05/05
- [PATCH 09/16] build: no more recursion for lib/autoconf subdir, Stefano Lattarini, 2013/05/05
- [PATCH 10/16] build: no more recursion for lib/Autom4te subdir,
Stefano Lattarini <=
- [PATCH 11/16] build: define RELEASE_YEAR with AC_SUBST, Stefano Lattarini, 2013/05/05
- [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