diff options
| author | Ludovic Courtès | 2010-08-15 19:17:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2010-08-15 19:17:26 +0200 |
| commit | d34681e7e516cbbd8a79fb8bb45f741eea404fd6 (patch) | |
| tree | 1d15b90c0d356bf11d4ca355a60d540a5f1f2995 | |
| parent | 61fe28bd785f04fb4df33f43feef59406a9f0880 (diff) | |
| download | skribilo-d34681e7e516cbbd8a79fb8bb45f741eea404fd6.tar.gz skribilo-d34681e7e516cbbd8a79fb8bb45f741eea404fd6.tar.lz skribilo-d34681e7e516cbbd8a79fb8bb45f741eea404fd6.zip | |
Fix "make dist" wrt. `.go' files and generated files.
* guile-vm.am (nobase_dist_module_DATA): New variable. Move $(SOURCES)
from $(nobase_nodist_module_DATA) to here.
* src/guile/Makefile.am (SOURCES): Remove `skribilo/config.scm'.
(CLEANFILES): Set to $(nobase_nodist_module_DATA).
(nobase_nodist_module_DATA): New variable.
| -rw-r--r-- | guile-vm.am | 8 | ||||
| -rw-r--r-- | src/guile/Makefile.am | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/guile-vm.am b/guile-vm.am index d463407..8b291c5 100644 --- a/guile-vm.am +++ b/guile-vm.am @@ -6,8 +6,8 @@ if ENABLE_GUILE_VM # XXX: This expression relies on a GNU extension. GOBJECTS = $(SOURCES:%.scm=%.go) -nobase_nodist_module_DATA = \ - $(SOURCES) $(GOBJECTS) $(SOURCES_NOT_COMPILED) +nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED) +nobase_nodist_module_DATA = $(GOBJECTS) # Compiler warnings. guile_warnings = unused-variable unused-toplevel unbound-variable arity-mismatch @@ -30,7 +30,7 @@ SUFFIXES += .go else !ENABLE_GUILE_VM -nobase_nodist_module_DATA = \ - $(SOURCES) $(SOURCES_NOT_COMPILED) +nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED) +nobase_nodist_module_DATA = endif !ENABLE_GUILE_VM diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am index 9136fac..536e34b 100644 --- a/src/guile/Makefile.am +++ b/src/guile/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2005, 2006, 2007, 2008, 2009 Ludovic Courtès <ludo@gnu.org> +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 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 @@ -26,7 +26,6 @@ EXTRA_DIST = \ SOURCES = \ skribilo.scm diff.scm \ - skribilo/config.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 \ @@ -75,11 +74,16 @@ SOURCES += \ skribilo/source/lisp-lex.scm skribilo/source/xml-lex.scm \ skribilo/source/c-lex.scm -CLEANFILES = $(nobase_module_DATA) +CLEANFILES = $(nobase_nodist_module_DATA) include $(top_srcdir)/substitute.am include $(top_srcdir)/guile-vm.am +# Generated files not part of the distribution. +nobase_nodist_module_DATA += \ + skribilo/config.scm skribilo/config.go \ + skribilo/utils/images.scm skribilo/utils/images.go + .in.scm: $(substitute) "$^" > "$@.tmp" && \ mv "$@.tmp" "$@" |