mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Aggregate `guile-readline' makefiles.

Browse source 
* configure.ac: Don't produce `guile-readline/ice-9/Makefile'.

* guile-readline/Makefile.am (SUBDIRS): Remove.
  (ice9dir, nobase_ice9_DATA): New, formerly under `ice-9'.
  (ETAGS_ARGS, EXTRA_DIST): Augment.
  (DEFS): Move outside of `if'.
  (MKDEP): Remove.

* guile-readline/ice-9/Makefile.am: Remove.
This commit is contained in:
Ludovic Courtès 2009-08-21 01:33:16 +02:00
parent 7a5ab3693c
commit 1549532ccb
3 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -1528,7 +1528,6 @@ AC_CONFIG_FILES([
libguile/Makefile libguile/Makefile
srfi/Makefile srfi/Makefile
guile-readline/Makefile guile-readline/Makefile
guile-readline/ice-9/Makefile
test-suite/Makefile test-suite/Makefile
test-suite/standalone/Makefile test-suite/standalone/Makefile
meta/Makefile meta/Makefile

17
guile-readline/Makefile.am
View file

@ -19,12 +19,17 @@
## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth ## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
## Floor, Boston, MA 02110-1301 USA ## Floor, Boston, MA 02110-1301 USA
SUBDIRS = ice-9 ## Prevent automake from adding extra -I options
DEFS = @DEFS@ @EXTRA_DEFS@
if HAVE_READLINE if HAVE_READLINE
## Prevent automake from adding extra -I options # `ice-9' subdirectory.
DEFS = @DEFS@ @EXTRA_DEFS@ ice9dir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)
nobase_ice9_DATA = ice-9/readline.scm
EXTRA_DIST = $(nobase_ice9_DATA)
## Check for headers in $(srcdir)/.., so that #include ## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'. ## building. Also look for Gnulib headers in `lib'.
@ -56,9 +61,11 @@ SUFFIXES = .x
.c.x: .c.x:
$(GUILE_SNARF) -o $@ $< $(snarfcppopts) $(GUILE_SNARF) -o $@ $< $(snarfcppopts)
EXTRA_DIST = LIBGUILEREADLINE-VERSION ChangeLog-2008 EXTRA_DIST += LIBGUILEREADLINE-VERSION ChangeLog-2008
MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) ETAGS_ARGS = \
$(nobase_ice9_DATA) \
$(libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES)
CLEANFILES = *.x CLEANFILES = *.x

28
guile-readline/ice-9/Makefile.am
View file

@ -1,28 +0,0 @@
## Process this file with Automake to create Makefile.in
##
## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
##
## This file is part of guile-readline.
##
## guile-readline 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, or
## (at your option) any later version.
##
## guile-readline 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 guile-readline; see the file COPYING. If not, write
## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
## Floor, Boston, MA 02110-1301 USA
# Guile's `pkgdatadir'.
guile_pdd = $(datadir)/guile
ice9dir = $(guile_pdd)/$(GUILE_EFFECTIVE_VERSION)/ice-9
ice9_DATA = readline.scm
ETAGS_ARGS = $(ice9_DATA)
EXTRA_DIST = $(ice9_DATA)