diff options
| author | Arun Isaac | 2021-07-04 19:00:48 +0530 |
|---|---|---|
| committer | Arun Isaac | 2021-07-04 19:41:02 +0530 |
| commit | e49d8fec2fa5fa69bf93b76e921e9a1eeff8f1af (patch) | |
| tree | c4630249271c5f9abc4e7b07e99b4a79a2da30f8 | |
| parent | b27749fef5e6886553050efdf85715a2428c43c8 (diff) | |
| download | ccwl-e49d8fec2fa5fa69bf93b76e921e9a1eeff8f1af.tar.gz ccwl-e49d8fec2fa5fa69bf93b76e921e9a1eeff8f1af.tar.lz ccwl-e49d8fec2fa5fa69bf93b76e921e9a1eeff8f1af.zip | |
Makefile: Include .depends with automake.
* bootstrap.sh: Generate .depends.
* Makefile.am: Include .depends with automake, not with make.
(.depends): Delete rule.
(doc/ccwl.html, doc/ccwl.info): Use DOC_OTHER instead of
DOC_OTHER_DEPENDENCIES.
(CLEANFILES): Remove .depends.
* build-aux/find-dependencies.scm: Output DOC_OTHER instead of
DOC_OTHER_DEPENDENCIES. _DEPENDENCIES variables are special in
automake.
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rwxr-xr-x | bootstrap.sh | 1 | ||||
| -rw-r--r-- | build-aux/find-dependencies.scm | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index b7be9bb..96a0662 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,14 +89,8 @@ EXTRA_DIST += \ # Build documentation -CLEANFILES += .depends +include .depends -.depends: build-aux/find-dependencies.scm doc/ccwl.skb - $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE) --no-auto-compile $< > $@ - -# We prefix with - so that automake does not fail when .depends is -# missing. --include .depends CLEANFILES += doc/*.cwl doc/%.dot doc/*.svg %.cwl: %.scm @@ -119,10 +113,10 @@ html-local: doc/ccwl.html CLEANFILES += doc/ccwl.info doc/skribilo.go CLEAN_DIRECTORIES = doc/ccwl.html -doc/ccwl.info: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES) +doc/ccwl.info: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER) $(SKRIBILO_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) -t info $< -o $@ -doc/ccwl.html: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER_DEPENDENCIES) +doc/ccwl.html: doc/ccwl.skb doc/skribilo.go $(DOC_IMAGES) $(DOC_OTHER) rm -rf $@ $(MKDIR_P) $@ $(SKRIBILO_GEN)$(top_builddir)/pre-inst-env $(SKRIBILO) -t html $< -o $@/index.html diff --git a/bootstrap.sh b/bootstrap.sh index 1e8f2fb..cc651f2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -18,4 +18,5 @@ # You should have received a copy of the GNU General Public License # along with ccwl. If not, see <https://www.gnu.org/licenses/>. +guile --no-auto-compile build-aux/find-dependencies.scm > .depends autoreconf --verbose --install --force diff --git a/build-aux/find-dependencies.scm b/build-aux/find-dependencies.scm index fb68e9c..5ced7fb 100644 --- a/build-aux/find-dependencies.scm +++ b/build-aux/find-dependencies.scm @@ -69,7 +69,7 @@ dependency is of the form (tag . file). tag may either be the symbol (_ #f)) dependencies) " ")) - (format #t "DOC_OTHER_DEPENDENCIES = ~a~%" + (format #t "DOC_OTHER = ~a~%" (string-join (filter-map (match-lambda (('other . file) file) (_ #f)) |