Aggregate `guile-readline' makefiles.

* 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
commit 1549532ccb
3 changed files with 12 additions and 34 deletions

View file

@ -19,12 +19,17 @@
## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
## Floor, Boston, MA 02110-1301 USA
SUBDIRS = ice-9
## Prevent automake from adding extra -I options
DEFS = @DEFS@ @EXTRA_DEFS@
if HAVE_READLINE
## Prevent automake from adding extra -I options
DEFS = @DEFS@ @EXTRA_DEFS@
# `ice-9' subdirectory.
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
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'.
@ -56,9 +61,11 @@ SUFFIXES = .x
.c.x:
$(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