Recursive make sucks: remove 11 makefiles.

14 files changed, 129 insertions, 120 deletions

diff --git a/configure.ac b/configure.ac
index 2371b47..47dfd6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,18 +93,8 @@ AC_OUTPUT([Makefile
 	   po/Makefile.in
 	   src/Makefile
 	   src/guile/Makefile
-	   src/guile/skribilo/Makefile
-	   src/guile/skribilo/utils/Makefile
 	   src/guile/skribilo/utils/images.scm
-	   src/guile/skribilo/engine/Makefile
-	   src/guile/skribilo/reader/Makefile
-	   src/guile/skribilo/package/Makefile
-	   src/guile/skribilo/package/slide/Makefile
-	   src/guile/skribilo/package/eq/Makefile
-	   src/guile/skribilo/package/pie/Makefile
-	   src/guile/skribilo/source/Makefile
-	   src/guile/skribilo/biblio/Makefile
-	   doc/Makefile
+           doc/Makefile
 	   doc/user/Makefile
 	   doc/modules/Makefile
 	   doc/man/Makefile
diff --git a/guile-lint.am b/guile-lint.am
index 7edf72d..f54dc4c 100644
--- a/guile-lint.am
+++ b/guile-lint.am
@@ -12,8 +12,12 @@ if HAVE_GUILE_LINT
 # Note: We re-export `$GUILE' to make sure Guile-Lint uses the same
 # Guile as we do, e.g., on NixOS.
 
-all-local: $(dist_module_DATA)
+BUILT_SOURCES  = stamp-lint
+CLEANFILES    += stamp-lint
+
+stamp-lint: $(lintable)
 	-GUILE="$(GUILE)"					\
 	$(GUILE_LINT) -L $(top_srcdir)/src/guile		\
 		      -L $(top_builddir)/src/guile -k $^
+	touch $@
 endif
diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am
index 227231b..ab9c3b5 100644
--- a/src/guile/Makefile.am
+++ b/src/guile/Makefile.am
@@ -1,6 +1,126 @@
-SUBDIRS = skribilo
+# Copyright 2005, 2006, 2007, 2008  Ludovic Courtès <ludo@gnu.org>
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 moduledir = $(guilemoduledir)
-dist_module_DATA = skribilo.scm diff.scm
 
-EXTRA_DIST = README
+EXTRA_DIST =						\
+  README						\
+  skribilo/source/lisp-lex.l				\
+  skribilo/source/xml-lex.l skribilo/source/c-lex.l	\
+  skribilo/utils/images.scm.in skribilo/config.in
+
+nobase_dist_module_DATA =						\
+  skribilo.scm diff.scm							\
+  skribilo/biblio/bibtex.scm skribilo/biblio/author.scm			\
+  skribilo/biblio/abbrev.scm skribilo/biblio/template.scm		\
+  skribilo/utils/syntax.scm skribilo/utils/compat.scm			\
+  skribilo/utils/files.scm skribilo/utils/keywords.scm			\
+  skribilo/utils/strings.scm						\
+  skribilo/source/parameters.scm skribilo/source/c.scm			\
+  skribilo/source/lisp.scm skribilo/source/xml.scm			\
+  skribilo/biblio.scm skribilo/color.scm				\
+  skribilo/debug.scm skribilo/engine.scm skribilo/evaluator.scm		\
+  skribilo/index.scm skribilo/lib.scm skribilo/module.scm		\
+  skribilo/output.scm skribilo/prog.scm					\
+  skribilo/reader.scm skribilo/resolve.scm				\
+  skribilo/source.scm skribilo/parameters.scm skribilo/verify.scm	\
+  skribilo/writer.scm skribilo/ast.scm skribilo/location.scm		\
+  skribilo/condition.scm skribilo/sui.scm
+
+nobase_dist_module_DATA +=			\
+  $(readers) $(engines) $(packages)
+
+readers =							\
+  skribilo/reader/skribe.scm skribilo/reader/outline.scm
+
+engines =						\
+  skribilo/engine/base.scm skribilo/engine/context.scm	\
+  skribilo/engine/html.scm skribilo/engine/html4.scm	\
+  skribilo/engine/latex.scm skribilo/engine/lout.scm	\
+  skribilo/engine/xml.scm
+
+packages =								\
+  skribilo/package/acmproc.scm skribilo/package/french.scm		\
+  skribilo/package/jfp.scm skribilo/package/letter.scm			\
+  skribilo/package/lncs.scm skribilo/package/scribe.scm			\
+  skribilo/package/sigplan.scm skribilo/package/slide.scm		\
+  skribilo/package/web-article.scm skribilo/package/web-book.scm	\
+  skribilo/package/eq.scm skribilo/package/pie.scm			\
+  skribilo/package/base.scm skribilo/package/diff.scm			\
+  skribilo/package/html-navtabs.scm skribilo/package/web-book2.scm	\
+  skribilo/package/pie/lout.scm skribilo/package/eq/lout.scm		\
+  skribilo/package/slide/base.scm skribilo/package/slide/latex.scm	\
+  skribilo/package/slide/html.scm skribilo/package/slide/lout.scm
+
+# Generated files not part of the distribution.
+nobase_module_DATA =				\
+  skribilo/config.scm
+
+# Generated files part of the distribution.
+nobase_dist_module_DATA +=					\
+  skribilo/source/lisp-lex.scm skribilo/source/xml-lex.scm	\
+  skribilo/source/c-lex.scm
+
+CLEANFILES = $(nobase_module_DATA)
+
+
+include $(top_srcdir)/substitute.am
+
+.in.scm:
+	$(substitute) "$^" > "$@.tmp" &&	\
+	mv "$@.tmp" "$@"
+
+#all-local:
+#	if ! test -d "skribilo"; then mkdir "skribilo"; fi
+
+skribilo:
+	mkdir "skribilo" && mkdir -p "skribilo/utils" && \
+	mkdir -p "skribilo/source"
+
+clean-local:
+	-if test "$(top_builddir)" != "$(top_srcdir)";	\
+	 then rm -rf "skribilo" ; fi
+
+# Building the lexers with SILex.  You must have SILex installed in
+# `$(top_srcdir)/src/guile/silex'.  The Git repository already contains
+# it.  Otherwise, you can fetch it from
+# http://www.iro.umontreal.ca/~dube/silex-src.tar.gz .
+#
+# Note: Those files should normally be part of the distribution, making
+# this rule useless to the user.
+.l.scm:
+	$(GUILE) -L $(top_srcdir)/src/guile/silex			\
+	         -c '(load-from-path "lex.scm") (lex "$^" "$@")' &&	\
+	mv "$@" "$@.tmp" &&						\
+	echo '(define-module (skribilo source $(^:skribilo/source/%.l=%))' \
+	     > "$@" &&	\
+	echo '  :use-module (skribilo lib)' >> "$@" &&			\
+	echo '  :use-module (skribilo source parameters)'		\
+		>> "$@" &&						\
+	echo '  :use-module (srfi srfi-1)' >> "$@" &&			\
+	echo '  :export (lexer-init lexer' >> "$@" &&			\
+	echo '           lexer-get-func-column' >> "$@" &&		\
+	echo '           lexer-get-func-offset' >> "$@" &&		\
+	echo '           lexer-get-line lexer-getc' >> "$@" &&		\
+	echo '           lexer-ungetc))' >> "$@" &&			\
+	cat "$@.tmp" >> "$@" &&						\
+	rm "$@.tmp"
+
+
+lintable = $(nobase_dist_module_DATA) $(nobase_module_DATA)
+
+include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/Makefile.am b/src/guile/skribilo/Makefile.am
deleted file mode 100644
index 3846af4..0000000
--- a/src/guile/skribilo/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo
-dist_module_DATA =      biblio.scm color.scm config.scm		\
-                        debug.scm engine.scm evaluator.scm	\
-			index.scm lib.scm module.scm		\
-		        output.scm prog.scm			\
-		        reader.scm resolve.scm			\
-			source.scm parameters.scm verify.scm	\
-			writer.scm ast.scm location.scm		\
-			condition.scm sui.scm
-
-SUBDIRS = utils reader engine package source biblio
-
-CLEANFILES = config.scm
-
-include $(top_srcdir)/substitute.am
-
-.in:
-	$(substitute) "$^" > "$@.tmp" &&	\
-	mv "$@.tmp" "$@"
-
-include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/biblio/Makefile.am b/src/guile/skribilo/biblio/Makefile.am
deleted file mode 100644
index aebc8db..0000000
--- a/src/guile/skribilo/biblio/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/biblio
-dist_module_DATA = bibtex.scm author.scm abbrev.scm template.scm
-
-include $(top_srcdir)/guile-lint.am
-
-## arch-tag: aeffaead-c3f0-47f3-a0b3-bb3e22da2657
diff --git a/src/guile/skribilo/config.scm.in b/src/guile/skribilo/config.in
index 34c0404..34c0404 100644
--- a/src/guile/skribilo/config.scm.in
+++ b/src/guile/skribilo/config.in
diff --git a/src/guile/skribilo/engine/Makefile.am b/src/guile/skribilo/engine/Makefile.am
deleted file mode 100644
index 8983723..0000000
--- a/src/guile/skribilo/engine/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/engine
-dist_module_DATA =      base.scm context.scm html.scm html4.scm	\
-			latex.scm lout.scm xml.scm
-
-include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/package/Makefile.am b/src/guile/skribilo/package/Makefile.am
deleted file mode 100644
index 191b102..0000000
--- a/src/guile/skribilo/package/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/package
-dist_module_DATA =      acmproc.scm french.scm jfp.scm letter.scm	\
-			lncs.scm scribe.scm sigplan.scm			\
-			slide.scm web-article.scm web-book.scm		\
-			eq.scm pie.scm base.scm diff.scm		\
-			html-navtabs.scm web-book2.scm
-
-SUBDIRS = slide eq pie
-
-include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/package/eq/Makefile.am b/src/guile/skribilo/package/eq/Makefile.am
deleted file mode 100644
index ede4d87..0000000
--- a/src/guile/skribilo/package/eq/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/package/eq
-dist_module_DATA = lout.scm
-
-include $(top_srcdir)/guile-lint.am
-
-## arch-tag: 3e816c9a-7989-4baa-b38b-a095a5428ba1
diff --git a/src/guile/skribilo/package/pie/Makefile.am b/src/guile/skribilo/package/pie/Makefile.am
deleted file mode 100644
index a3f34f4..0000000
--- a/src/guile/skribilo/package/pie/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/package/pie
-dist_module_DATA = lout.scm
-
-include $(top_srcdir)/guile-lint.am
-
-## arch-tag: e6a03451-14c9-4331-8b96-71bde92ac142
diff --git a/src/guile/skribilo/package/slide/Makefile.am b/src/guile/skribilo/package/slide/Makefile.am
deleted file mode 100644
index 1925daf..0000000
--- a/src/guile/skribilo/package/slide/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/package/slide
-dist_module_DATA = base.scm latex.scm html.scm lout.scm
-
-include $(top_srcdir)/guile-lint.am
-
-## arch-tag: 56b5fa5c-bb6a-4692-b929-74bdd032431c
diff --git a/src/guile/skribilo/reader/Makefile.am b/src/guile/skribilo/reader/Makefile.am
deleted file mode 100644
index 628a9c4..0000000
--- a/src/guile/skribilo/reader/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/reader
-dist_module_DATA = skribe.scm outline.scm
-
-include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/source/Makefile.am b/src/guile/skribilo/source/Makefile.am
deleted file mode 100644
index d530085..0000000
--- a/src/guile/skribilo/source/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/source
-dist_module_DATA =      parameters.scm c.scm lisp.scm xml.scm	\
-			lisp-lex.scm xml-lex.scm c-lex.scm
-
-
-EXTRA_DIST = lisp-lex.l xml-lex.l c-lex.l
-
-# Building the lexers with SILex.  You must have SILex installed in
-# `$(top_srcdir)/src/guile/silex'.  The Git repository already contains
-# it.  Otherwise, you can fetch it from
-# http://www.iro.umontreal.ca/~dube/silex-src.tar.gz .
-#
-# Note: Those files should normally be part of the distribution, making
-# this rule useless to the user.
-.l.scm:
-	$(GUILE) -L $(top_srcdir)/src/guile/silex			\
-	         -c '(load-from-path "lex.scm") (lex "$^" "$@")' &&	\
-	mv "$@" "$@.tmp" &&						\
-	echo '(define-module (skribilo source $(^:%.l=%))' > "$@" &&	\
-	echo '  :use-module (skribilo lib)' >> "$@" &&			\
-	echo '  :use-module (skribilo source parameters)'		\
-		>> "$@" &&						\
-	echo '  :use-module (srfi srfi-1)' >> "$@" &&			\
-	echo '  :export (lexer-init lexer' >> "$@" &&			\
-	echo '           lexer-get-func-column' >> "$@" &&		\
-	echo '           lexer-get-func-offset' >> "$@" &&		\
-	echo '           lexer-get-line lexer-getc' >> "$@" &&		\
-	echo '           lexer-ungetc))' >> "$@" &&			\
-	cat "$@.tmp" >> "$@" &&						\
-	rm "$@.tmp"
-
-
-include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/utils/Makefile.am b/src/guile/skribilo/utils/Makefile.am
deleted file mode 100644
index d98c801..0000000
--- a/src/guile/skribilo/utils/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-moduledir = $(guilemoduledir)/skribilo/utils
-dist_module_DATA =      syntax.scm compat.scm files.scm \
-			keywords.scm strings.scm
-
-# This one is generated and need not be part of the distribution.
-module_DATA      =	images.scm
-
-include $(top_srcdir)/guile-lint.am