diff options
| author | Ludovic Courtès | 2012-04-25 14:38:11 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2012-04-25 14:38:11 +0200 |
| commit | d9522915175fdf3d81e8a795d3705fe7aa1fa6fc (patch) | |
| tree | 60f8226658516b58fb0ffa6379f1ec638d4210dc | |
| parent | 68cc48df95f2f8e3f3fbf326aacc8426e4aac9af (diff) | |
| download | skribilo-d9522915175fdf3d81e8a795d3705fe7aa1fa6fc.tar.gz skribilo-d9522915175fdf3d81e8a795d3705fe7aa1fa6fc.tar.lz skribilo-d9522915175fdf3d81e8a795d3705fe7aa1fa6fc.zip | |
Remove support for `guile-lint'.
* guile-lint.am: Remove.
* Makefile.am (EXTRA_DIST): Remove `guile-lint.am'.
* doc/modules/Makefile.am (lintable): Remove.
Remove inclusion of `guile-lint.am'.
* src/guile/Makefile.am: Likewise.
* configure.ac: Remove check for `guile-lint' and `HAVE_GUILE_LINT'
conditional.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/modules/Makefile.am | 2 | ||||
| -rw-r--r-- | guile-lint.am | 25 | ||||
| -rw-r--r-- | src/guile/.gitignore | 1 | ||||
| -rw-r--r-- | src/guile/Makefile.am | 5 |
6 files changed, 1 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index d0524f3..778792b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,5 +2,4 @@ SUBDIRS = po src doc emacs tests ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = TODO THANKS README.Skribe ChangeLog.Skribe \ - guile-lint.am +EXTRA_DIST = TODO THANKS README.Skribe ChangeLog.Skribe diff --git a/configure.ac b/configure.ac index a0617b9..40924d9 100644 --- a/configure.ac +++ b/configure.ac @@ -38,12 +38,6 @@ AM_CONDITIONAL([ENABLE_GUILE_VM], [test "x$enable_guile_vm" = "xyes" && \ $GUILE_TOOLS compile --help 2>&1 >/dev/null]) -# 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. GUILE_MODULE_REQUIRED([system reader]) diff --git a/doc/modules/Makefile.am b/doc/modules/Makefile.am index 9a1803c..ca3459f 100644 --- a/doc/modules/Makefile.am +++ b/doc/modules/Makefile.am @@ -13,6 +13,4 @@ CLEANFILES = SUFFIXES = -lintable = $(EXTRA_DIST) -include $(top_srcdir)/guile-lint.am include $(top_srcdir)/guile-vm.am diff --git a/guile-lint.am b/guile-lint.am deleted file mode 100644 index 5559e82..0000000 --- a/guile-lint.am +++ /dev/null @@ -1,25 +0,0 @@ -# Rules for Guile-Lint. -# See http://www.geocities.com/user42_kevin/guile-lint/index.html . - -if HAVE_GUILE_LINT - -# FIXME: Guile-Lint 9 or so always returned zero, but Guile-Lint 12 -# returns an actual status code depending on whether errors were -# encountered, which is good, except that it sometimes erroneously -# reports errors (e.g., with macros). So better ignore its exit code -# for now. - -# Note: We re-export `$GUILE' to make sure Guile-Lint uses the same -# Guile as we do, e.g., on NixOS. - -BUILT_SOURCES = stamp-lint -CLEANFILES += stamp-lint - -stamp-lint: $(lintable) - -GUILE="$(GUILE)" \ - $(GUILE_LINT) -L $(top_srcdir)/src/guile \ - -L $(top_builddir)/src/guile \ - -L $(top_srcdir)/doc/modules \ - -k $^ - touch $@ -endif diff --git a/src/guile/.gitignore b/src/guile/.gitignore index 9b141a6..e69de29 100644 --- a/src/guile/.gitignore +++ b/src/guile/.gitignore @@ -1 +0,0 @@ -stamp-lint diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am index 9e959e0..4f18b5d 100644 --- a/src/guile/Makefile.am +++ b/src/guile/Makefile.am @@ -134,8 +134,3 @@ clean-local: echo ' lexer-ungetc))' >> "$@" && \ cat "$@.tmp" >> "$@" && \ rm "$@.tmp" - - -lintable = $(nobase_dist_module_DATA) $(nobase_module_DATA) - -include $(top_srcdir)/guile-lint.am |