[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: doc/*/Makefile.am: remove unnecessary ru
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: doc/*/Makefile.am: remove unnecessary rules. |
|
Date: |
Wed, 30 Oct 2019 18:43:31 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new e28c41cf0 doc/*/Makefile.am: remove unnecessary rules.
e28c41cf0 is described below
commit e28c41cf0e66289cfaf233539e0f42cf7b2646c4
Author: ng0 <address@hidden>
AuthorDate: Wed Oct 30 17:40:35 2019 +0000
doc/*/Makefile.am: remove unnecessary rules.
---
doc/handbook/Makefile.am | 126 +++++++++--------------------------------------
doc/man/Makefile.am | 2 +
doc/tutorial/Makefile.am | 113 +++++++-----------------------------------
3 files changed, 45 insertions(+), 196 deletions(-)
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 390018e1c..c4d131029 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -3,12 +3,6 @@ docdir = $(datadir)/doc/gnunet/
infoimagedir = $(infodir)/images
-#DOT_FILES = images/$(wildcard *.dot)
-
-#DOT_VECTOR_GRAPHICS =
\
-# $(DOT_FILES:%.dot=%.eps)
\
-# $(DOT_FILES:%.dot=%.pdf)
-
if ACTIVATE_TEXINFO4
# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
@@ -65,36 +59,6 @@ dist_infoimage_DATA =
\
images/gns.dot \
images/gns.jpg
-# images/$(wildcard *.png)
\
-# images/$(wildcard *.svg)
-# $(DOT_FILES:%.dot=%.png)
-
-#DOT_OPTIONS =
\
-# -Gratio=.9 -Gnodesep=.005 -Granksep=.00005
\
-# -Nfontsite=9 -Nheight=.1 -Nwidth=.1
-
-# .dot.png:
-# $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.pdf:
-# $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.eps:
-# $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .png.eps:
-# $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
-# mv "$@-tmp.eps" "$@"
-
-# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
-# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
-# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
-# $(top_srcdir)/%D%/images/coreutils-size-map.eps
-# dvi-local: ps-local
-
info_TEXINFOS = \
gnunet.texi
@@ -125,9 +89,6 @@ EXTRA_DIST =
\
style.css
-# $(DOT_FILES)
\
-# $(DOT_VECTOR_GRAPHICS)
-
DISTCLEANFILES = \
gnunet.cps \
chapters/developer.cps \
@@ -141,6 +102,19 @@ DISTCLEANFILES =
\
agpl-3.0.cps \
gpl-3.0.cps
+CLEANFILES= \
+ stamp-vti \
+ version.texi \
+ $(DISTCLEANFILES)
+
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+ rm -fr manual
+ rm -fr gnunet.html
+ rm -fr gnunet.t2p
+ rm -fr gnunet-c-tutorial.t2p
+
# if HAVE_EXTENDED_DOCUMENTATION_BUILDING
daemon_lego_block.png: images/daemon_lego_block.svg
convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
@@ -154,66 +128,14 @@ lego_stack.png: images/lego_stack.svg
convert images/lego_stack.svg images/lego_stack.png &&
pngcrush images/lego_stack.png images/lego_stack.png
-# XXX: is this sed invocation portable enough? otherwise try tr(1).
-version.texi/replacement: version.texi/replacement/revert
- @sed "s/GPACKAGE_VERSION/$(PACKAGE_VERSION)/g" gversion.texi >
gversion.texi.tmp
- @mv gversion.texi.tmp gversion.texi
-
-version.texi/replacement/revert:
- @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
- @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-
-
-# FIXME: rm *.html and *.pdf
-#doc-clean:
-# @rm *.aux *.log *.toc *.cp *.cps
-
-all: version.texi/replacement
-
-doc-all-install:
- @mkdir -p $(DESTDIR)/$(docdir)
- @mkdir -p $(DESTDIR)/$(infoimagedir)
- @mkdir -p $(DESTDIR)/$(infodir)
- @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
- @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
- @install gnunet.html $(DESTDIR)/$(docdir)
-
-doc-gendoc-install:
- @mkdir -p $(DESTDIR)/$(docdir)
- @cp -r manual $(DESTDIR)/$(docdir)
-
-# @cp -r images $(DESTDIR)/$(infoimagedir)
-
-dev-build: version.texi/replacement
- @makeinfo --pdf gnunet.texi
- @makeinfo --html gnunet.texi
- @makeinfo --no-split gnunet.texi
-
-# TODO: Add more to clean.
-clean: version.texi/replacement/revert
- @rm -f gnunet.pdf
- @rm -rf gnunet.html
- @rm -f gnunet.info
- @rm -f gnunet.info-1
- @rm -f gnunet.info-2
- @rm -f gnunet.info-3
- @rm -fr gnunet.t2p
- @rm -fr gnunet-c-tutorial.t2p
- @rm -fr manual
-
-# CLEANFILES = \
-# gnunet.log \
-# gnunet-c-tutorial.log \
-# $(wildcard *.aux) \
-# $(wildcard *.toc) \
-# $(wildcard *.cp) \
-# $(wildcard *.cps)
-
-#.PHONY: version.texi
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF
-
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML
-
-# endif
-# endif
-# endif
+# doc-all-install:
+# @mkdir -p $(DESTDIR)/$(docdir)
+# @mkdir -p $(DESTDIR)/$(infoimagedir)
+# @mkdir -p $(DESTDIR)/$(infodir)
+# @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
+# @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
+# @install gnunet.html $(DESTDIR)/$(docdir)
+
+# doc-gendoc-install:
+# @mkdir -p $(DESTDIR)/$(docdir)
+# @cp -r manual $(DESTDIR)/$(docdir)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index b3ea1c44e..82cdfc06b 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -33,6 +33,8 @@ htmldocdir = $(datadir)/doc/gnunet/manhtml/
man-html-install:
@mkdir -p $(htmldocdir)
@mv $(srcdir)/*.html $(htmldocdir)
+man-html-uninstall:
+ @rm $(htmldocdir)/*.html
CLEANFILES += *.html
endif
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index f5c7d7742..6a7b1030b 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -1,12 +1,6 @@
# This Makefile.am is in the public domain
docdir = $(datadir)/doc/gnunet/
-#DOT_FILES = images/$(wildcard *.dot)
-
-#DOT_VECTOR_GRAPHICS = \
-# $(DOT_FILES:%.dot=%.eps) \
-# $(DOT_FILES:%.dot=%.pdf)
-
if ACTIVATE_TEXINFO4
# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
@@ -27,34 +21,7 @@ else
AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css"
--css-ref="../manual.css"
endif
-#DOT_OPTIONS = \
-# -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
-# -Nfontsite=9 -Nheight=.1 -Nwidth=.1
-
-# .dot.png:
-# $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.pdf:
-# $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.eps:
-# $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .png.eps:
-# $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
-# mv "$@-tmp.eps" "$@"
-
-# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
-# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
-# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
-# $(top_srcdir)/%D%/images/coreutils-size-map.eps
-# dvi-local: ps-local
-
-
-gnunet_tutorial_examples = \
+gnunet_tutorial_examples = \
examples/001.c \
examples/002.c \
examples/003.c \
@@ -80,43 +47,32 @@ gnunet_tutorial_examples =
\
examples/022.c \
examples/023.c \
examples/024.c \
- examples/025.Makefile.am \
- examples/026.c \
+ examples/025.Makefile.am \
+ examples/026.c \
examples/testbed_test.c
-info_TEXINFOS = \
+info_TEXINFOS = \
gnunet-tutorial.texi
-EXTRA_DIST = \
- $(gnunet_tutorial_examples) \
- htmlxref.cnf \
- run-gendocs.sh \
- docstyle.css \
- manual.css \
- reset.css \
- style.css
+EXTRA_DIST = \
+ $(gnunet_tutorial_examples) \
+ htmlxref.cnf \
+ run-gendocs.sh \
+ docstyle.css \
+ manual.css \
+ reset.css \
+ style.css
-DISTCLEANFILES = \
- gnunet-tutorial.cps \
+DISTCLEANFILES = \
+ gnunet-tutorial.cps \
fdl-1.3.cps
-# XXX: is this sed invocation portable enough? otherwise try tr(1).
-version.texi/replacement: version.texi/replacement/revert
- @sed "s/GPACKAGE_VERSION/$(PACKAGE_VERSION)/g" gversion.texi >
gversion.texi.tmp
- @mv gversion.texi.tmp gversion.texi
-
-version.texi/replacement/revert:
- @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
- @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-
-
-
-# FIXME: rm *.html and *.pdf
-#doc-clean:
-# @rm *.aux *.log *.toc *.cp *.cps
-
-all: version.texi/replacement
+CLEANFILES= \
+ stamp-vti \
+ version.texi \
+ gnunet-tutorial.t2p \
+ $(DISTCLEANFILES)
doc-all-install:
@mkdir -p $(DESTDIR)/$(docdir)
@@ -129,34 +85,3 @@ doc-all-install:
doc-gendoc-install:
@mkdir -p $(DESTDIR)/$(docdir)
@cp -r manual $(DESTDIR)/$(docdir)
-
-# @cp -r images $(DESTDIR)/$(infoimagedir)
-
-dev-build: version.texi/replacement
- @makeinfo --pdf gnunet-c-tutorial.texi
- @makeinfo --html gnunet-c-tutorial.texi
- @makeinfo --no-split gnunet-c-tutorial.texi
-
-# TODO: Add more to clean.
-clean: version.texi/replacement/revert
- @rm -f gnunet-tutorial.pdf
- @rm -f gnunet-tutorial.info
- @rm -rf gnunet-tutorial.html
- @rm -fr gnunet-tutorial.t2p
-
-# CLEANFILES = \
-# gnunet.log \
-# gnunet-c-tutorial.log \
-# $(wildcard *.aux) \
-# $(wildcard *.toc) \
-# $(wildcard *.cp) \
-# $(wildcard *.cps)
-
-#.PHONY: version.texi
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF
-
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML
-
-# endif
-# endif
-# endif
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: doc/*/Makefile.am: remove unnecessary rules.,
gnunet <=