diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-05-15 12:17:57 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-05-15 12:17:57 +0300 |
commit | 6ed15cc122e4f1f6281952a7b484ea038c73f816 (patch) | |
tree | 4061794595be3b1838bca38129f43080e922047e | |
parent | 448b11b3f51873392e916eec9dbe1dd11a96c72b (diff) | |
download | cfpeek-6ed15cc122e4f1f6281952a7b484ea038c73f816.tar.gz cfpeek-6ed15cc122e4f1f6281952a7b484ea038c73f816.tar.bz2 |
Fix makefiles, upgrade submodules, fix docbuild
* gint: Upgrade.
* grecs: Upgrade.
* src/Makefile.am: Remove obsolete use of INCLUDES
* doc/Makefile.am: Use Makeinfo 5 instead of texi2html
* doc/Config: Rename to doc/html.init.
-rw-r--r-- | doc/Makefile.am | 10 | ||||
-rw-r--r-- | doc/html.init (renamed from doc/Config) | 10 | ||||
m--------- | gint | 0 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | src/Makefile.am | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 134a489..b8021fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -47,3 +47,3 @@ EXTRA_DIST = sample.conf GNUmakefile togit.scm | |||
47 | 47 | ||
48 | AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@ -I$(top_srcdir)/@GRECS_SUBDIR@/doc | 48 | AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@ -I $(top_srcdir)/@GRECS_SUBDIR@/doc |
49 | imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS) | 49 | imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS) |
@@ -52,6 +52,6 @@ CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh | |||
52 | 52 | ||
53 | GENDOCS=$(srcdir)/gendocs.sh | 53 | GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init' |
54 | EXTRA_DIST += gendocs.sh | 54 | EXTRA_DIST += gendocs.sh |
55 | 55 | ||
56 | TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E | 56 | TEXI2DVI=texi2dvi -t '@set $(RENDITION)' |
57 | 57 | ||
@@ -63,4 +63,4 @@ manual: | |||
63 | MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \ | 63 | MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \ |
64 | TEXI2DVI="$(TEXI2DVI) -t @finalout" \ | 64 | TEXI2DVI="$(TEXI2DVI) -E" \ |
65 | $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual' | 65 | $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual' |
66 | 66 | ||
diff --git a/doc/Config b/doc/html.init index e3d8942..7613faa 100644 --- a/doc/Config +++ b/doc/html.init | |||
@@ -80,8 +80,6 @@ set_from_init_file('BIG_RULE', ''); | |||
80 | 80 | ||
81 | # Turn off footer buttons in section split | 81 | # Turn off navigation bars at the bottom of each section in chapter split mode, |
82 | set_from_init_file('SECTION_FOOTER_BUTTONS', undef); | 82 | # or subsection in section split mode. |
83 | #set_from_init_file('SECTION_BUTTONS', undef); | ||
84 | # Turn off navigation bars at the bottom of each section in chapter split mode | ||
85 | set_from_init_file('HEADERS', undef) | 83 | set_from_init_file('HEADERS', undef) |
86 | if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter')); | 84 | if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section')); |
87 | # Use navigation icons | 85 | # Use navigation icons |
@@ -154,2 +152,3 @@ my @gray_buttons = (\&gray_document_title, ' ', | |||
154 | 152 | ||
153 | set_from_init_file('TOP_BUTTONS', undef); | ||
155 | set_from_init_file('SECTION_BUTTONS', \@gray_buttons); | 154 | set_from_init_file('SECTION_BUTTONS', \@gray_buttons); |
@@ -157,2 +156,3 @@ set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons); | |||
157 | set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons); | 156 | set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons); |
157 | set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons); | ||
158 | set_from_init_file('MISC_BUTTONS', | 158 | set_from_init_file('MISC_BUTTONS', |
diff --git a/gint b/gint | |||
Subproject b39efd37a7fbf478072c72f82b4310c8620a4ce | Subproject fd86bf7d44b0c970771830692ae7491447ebe8b | ||
diff --git a/grecs b/grecs | |||
Subproject 83a06bbc6b3796a0b8646816da34c6672488cbf | Subproject b9df6a46ac8bd1dcbb3a3061fed4d86d739be21 | ||
diff --git a/src/Makefile.am b/src/Makefile.am index 061956c..0cf6a08 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,3 +1,3 @@ | |||
1 | # This file is part of cfpeek | 1 | # This file is part of cfpeek |
2 | # Copyright (C) 2011 Sergey Poznyakoff | 2 | # Copyright (C) 2011,2015 Sergey Poznyakoff |
3 | # | 3 | # |
@@ -30,4 +30,4 @@ cfpeek_SOURCES = \ | |||
30 | LDADD=@GRECS_LDADD@ @GUILE_LIBS@ | 30 | LDADD=@GRECS_LDADD@ @GUILE_LIBS@ |
31 | INCLUDES = -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@ | ||
32 | AM_CPPFLAGS= \ | 31 | AM_CPPFLAGS= \ |
32 | -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@\ | ||
33 | -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)" | 33 | -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)" |