nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Build docs from the top-level Makefile. 

This undoes commit 575ed8d ("doc: Create own Makefile.am in subdirectory."),
and fixes a bug whereby "make pdf" or "make ps" wouldn't do anything.

* doc/Makefile.am: Remove.
* doc.am: New file.  Use `-local' rules to build the image.
* Makefile.am: Include it.
* configure.ac: Use `-Woverride' to avoid undesired overridding of
  Automake rules.
This commit is contained in:
Ludovic Courtès 2013-08-29 21:20:51 +02:00
parent 88bd1804a2
commit a9424c0887
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -186,7 +186,9 @@ SUFFIXES = .go
guix_install_go_files = install-nobase_nodist_guilemoduleDATA guix_install_go_files = install-nobase_nodist_guilemoduleDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
SUBDIRS = doc po SUBDIRS = po
include doc.am
if BUILD_DAEMON if BUILD_DAEMON

2
configure.ac
View File

@ -7,7 +7,7 @@ AC_INIT([GNU Guix], [0.4], [bug-guix@gnu.org], [guix],
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \ AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \
color-tests parallel-tests]) color-tests parallel-tests -Woverride])
AC_CONFIG_SRCDIR([guix.scm]) AC_CONFIG_SRCDIR([guix.scm])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

27
doc/Makefile.am → doc.am
View File

@ -1,4 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2013 Andreas Enge <andreas@enge.fr>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
@ -16,19 +17,19 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. # along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
info_TEXINFOS = guix.texi info_TEXINFOS = doc/guix.texi
EXTRA_DIST = \ EXTRA_DIST += \
fdl-1.3.texi \ doc/fdl-1.3.texi \
images/bootstrap-graph.dot \ doc/images/bootstrap-graph.dot \
images/bootstrap-graph.eps doc/images/bootstrap-graph.eps
infoimagedir = $(infodir)/images infoimagedir = $(infodir)/images
dist_infoimage_DATA = images/bootstrap-graph.png dist_infoimage_DATA = doc/images/bootstrap-graph.png
# Try hard to obtain an image size and aspect that's reasonable for inclusion # Try hard to obtain an image size and aspect that's reasonable for inclusion
# in an Info or PDF document. # in an Info or PDF document.
DOT_OPTIONS = \ DOT_OPTIONS = \
-Tpng -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \ -Tpng -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
-Nfontsize=9 -Nheight=.1 -Nwidth=.1 -Nfontsize=9 -Nheight=.1 -Nwidth=.1
.dot.png: .dot.png:
@ -39,7 +40,9 @@ DOT_OPTIONS = \
dot -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp" dot -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
mv "$@.tmp" "$@" mv "$@.tmp" "$@"
guix.pdf: images/bootstrap-graph.png # We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
guix.info: images/bootstrap-graph.png # Extending"). Using the `-local' rules is imperfect, because they may be
guix.ps: images/bootstrap-graph.eps # triggered after the main rule. Oh, well.
pdf-local: doc/images/bootstrap-graph.png
info-local: doc/images/bootstrap-graph.png
ps-local: doc/images/bootstrap-graph.eps