Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / guile-readline / Makefile.am

diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index e749ce8..0c4ca77 100644 (file)
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+##   Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008,
+##     2009, 2010, 2012 Free Software Foundation, Inc.
 ##
 ##   This file is part of guile-readline.
 ##
@@ -20,17 +21,18 @@
 ##   Floor, Boston, MA 02110-1301 USA
 
 include $(top_srcdir)/am/snarf
+include $(top_srcdir)/am/guilec
 
 ## Prevent automake from adding extra -I options
 DEFS = @DEFS@ @EXTRA_DEFS@
 
-if HAVE_READLINE
+# We're at the root of the module hierarchy.
+modpath =
+SOURCES =
 
-# `ice-9' subdirectory.
-ice9dir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)
-nobase_ice9_DATA = ice-9/readline.scm
-EXTRA_DIST = $(nobase_ice9_DATA)
+if HAVE_READLINE
 
+SOURCES += ice-9/readline.scm
 
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
@@ -58,17 +60,16 @@ modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
 modinclude_HEADERS = readline.h
 
 snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-SUFFIXES = .x
+SUFFIXES += .x
 .c.x:
        $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
 
 EXTRA_DIST += LIBGUILEREADLINE-VERSION ChangeLog-2008
 
-ETAGS_ARGS =                                                   \
-  $(nobase_ice9_DATA)                                          \
+ETAGS_ARGS +=                                                  \
   $(libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES)
 
-CLEANFILES = *.x
+CLEANFILES += *.x *.go
 
 endif HAVE_READLINE