From 247fc2730a286989cecc202db93d001415bb33a8 Mon Sep 17 00:00:00 2001 From: Ludovic Court`es Date: Tue, 5 Jun 2007 15:53:58 +0000 Subject: Added support for Guile-Lint. * configure.ac: Look for `guile-lint'. * */Makefile.am: Include `guile-lint.am'. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-56 --- configure.ac | 6 ++++++ guile-lint.am | 8 ++++++++ src/guile/skribilo/Makefile.am | 2 ++ src/guile/skribilo/biblio/Makefile.am | 2 ++ src/guile/skribilo/coloring/Makefile.am | 2 ++ src/guile/skribilo/engine/Makefile.am | 5 +++++ src/guile/skribilo/package/Makefile.am | 2 ++ src/guile/skribilo/package/eq/Makefile.am | 2 ++ src/guile/skribilo/package/pie/Makefile.am | 2 ++ src/guile/skribilo/package/slide/Makefile.am | 2 ++ src/guile/skribilo/reader/Makefile.am | 2 ++ src/guile/skribilo/utils/Makefile.am | 2 ++ 12 files changed, 37 insertions(+) create mode 100644 guile-lint.am diff --git a/configure.ac b/configure.ac index faab0bb..52f0b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,12 @@ AM_GNU_GETTEXT([external]) GUILE_PROGS GUILE_SITE_DIR +# Guile-Lint (http://www.geocities.com/user42_kevin/guile-lint/index.html) +AC_PATH_PROG([GUILE_LINT], [guile-lint]) +AC_SUBST([GUILE_LINT]) +AM_CONDITIONAL([HAVE_GUILE_LINT], test "x$GUILE_LINT" != "x") + + # Need guile-reader 0.2. GUILE_MODULE_REQUIRED([system reader]) diff --git a/guile-lint.am b/guile-lint.am new file mode 100644 index 0000000..9d7dde5 --- /dev/null +++ b/guile-lint.am @@ -0,0 +1,8 @@ +# Rules for Guile-Lint. +# See http://www.geocities.com/user42_kevin/guile-lint/index.html . + +if HAVE_GUILE_LINT +all-local: $(dist_guilemodule_DATA) + $(GUILE_LINT) -L $(top_srcdir)/src/guile \ + -L $(top_builddir)/src/guile -k $^ +endif diff --git a/src/guile/skribilo/Makefile.am b/src/guile/skribilo/Makefile.am index ea2be59..f25b08e 100644 --- a/src/guile/skribilo/Makefile.am +++ b/src/guile/skribilo/Makefile.am @@ -9,3 +9,5 @@ dist_guilemodule_DATA = biblio.scm color.scm config.scm \ condition.scm SUBDIRS = utils reader engine package coloring biblio + +include $(top_srcdir)/guile-lint.am diff --git a/src/guile/skribilo/biblio/Makefile.am b/src/guile/skribilo/biblio/Makefile.am index ee81406..8d4028e 100644 --- a/src/guile/skribilo/biblio/Makefile.am +++ b/src/guile/skribilo/biblio/Makefile.am @@ -1,4 +1,6 @@ guilemoduledir = $(GUILE_SITE)/skribilo/biblio dist_guilemodule_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/coloring/Makefile.am b/src/guile/skribilo/coloring/Makefile.am index b952237..2f68f5e 100644 --- a/src/guile/skribilo/coloring/Makefile.am +++ b/src/guile/skribilo/coloring/Makefile.am @@ -14,3 +14,5 @@ EXTRA_DIST = lisp-lex.l xml-lex.l c-lex.l $(GUILE) -L $(top_srcdir)/src/guile/silex \ -c '(load-from-path "lex.scm") (lex "$^" "$@")' + +include $(top_srcdir)/guile-lint.am diff --git a/src/guile/skribilo/engine/Makefile.am b/src/guile/skribilo/engine/Makefile.am index 7b6ec2c..784b718 100644 --- a/src/guile/skribilo/engine/Makefile.am +++ b/src/guile/skribilo/engine/Makefile.am @@ -3,3 +3,8 @@ dist_guilemodule_DATA = base.scm context.scm html.scm html4.scm \ latex-simple.scm latex.scm \ lout.scm \ xml.scm + +# FIXME: Guile-Lint can't be used here because of `define-skribe-module' +# and because of the custom reader syntax that's used. + +#include $(top_srcdir)/guile-lint.am diff --git a/src/guile/skribilo/package/Makefile.am b/src/guile/skribilo/package/Makefile.am index ac7c18e..9789867 100644 --- a/src/guile/skribilo/package/Makefile.am +++ b/src/guile/skribilo/package/Makefile.am @@ -5,3 +5,5 @@ dist_guilemodule_DATA = acmproc.scm french.scm jfp.scm letter.scm \ eq.scm pie.scm base.scm diff.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 index c7b4f93..a11bb75 100644 --- a/src/guile/skribilo/package/eq/Makefile.am +++ b/src/guile/skribilo/package/eq/Makefile.am @@ -1,4 +1,6 @@ guilemoduledir = $(GUILE_SITE)/skribilo/package/eq dist_guilemodule_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 index 3b4fafd..c6b8818 100644 --- a/src/guile/skribilo/package/pie/Makefile.am +++ b/src/guile/skribilo/package/pie/Makefile.am @@ -1,4 +1,6 @@ guilemoduledir = $(GUILE_SITE)/skribilo/package/pie dist_guilemodule_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 index 53320fa..18723dd 100644 --- a/src/guile/skribilo/package/slide/Makefile.am +++ b/src/guile/skribilo/package/slide/Makefile.am @@ -1,4 +1,6 @@ guilemoduledir = $(GUILE_SITE)/skribilo/package/slide dist_guilemodule_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 index 807e4a7..1509ba6 100644 --- a/src/guile/skribilo/reader/Makefile.am +++ b/src/guile/skribilo/reader/Makefile.am @@ -1,2 +1,4 @@ guilemoduledir = $(GUILE_SITE)/skribilo/reader dist_guilemodule_DATA = skribe.scm outline.scm + +include $(top_srcdir)/guile-lint.am diff --git a/src/guile/skribilo/utils/Makefile.am b/src/guile/skribilo/utils/Makefile.am index 9d9df6f..9bcaca0 100644 --- a/src/guile/skribilo/utils/Makefile.am +++ b/src/guile/skribilo/utils/Makefile.am @@ -2,4 +2,6 @@ guilemoduledir = $(GUILE_SITE)/skribilo/utils dist_guilemodule_DATA = syntax.scm compat.scm files.scm images.scm \ keywords.scm strings.scm +include $(top_srcdir)/guile-lint.am + ## arch-tag: 3a18b64b-1da2-417b-8338-2c534bca277f -- cgit v1.2.3