]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8386057)
Make man pages for the web site use para.css.
authorAndre Noll <maan@systemlinux.org>
Thu, 25 Oct 2007 20:46:57 +0000 (22:46 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 25 Oct 2007 20:46:57 +0000 (22:46 +0200)
Makefile.in patch | blob | history
web/documentation.in.html patch | blob | history

diff --git a/Makefile.in b/Makefile.in
index bbef37db3fc872a4576f6a9504a60149bdb138fc..190e1fc384ec8da748bfa89635eafd33face5d5b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = isotropic threshold
+codename = solar saturation
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -54,12 +54,13 @@ BINARIES = para_server para_client para_audioc para_recv \
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 man_binaries := $(BINARIES)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
+man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
 grutatxt := NEWS CREDITS INSTALL README FEATURES REQUIREMENTS README.afs
 grutatxt_html := $(grutatxt:=.html)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
 grutatxt := NEWS CREDITS INSTALL README FEATURES REQUIREMENTS README.afs
 grutatxt_html := $(grutatxt:=.html)
-html_in := $(wildcard web/*.in.html)
+html_in := $(wildcard web/*.in.html) $(man_pages_in)
 gen_html := $(subst web/,web/sync/,$(html_in))
 gen_html := $(gen_html:.in.html=.html)
 gruta_in := $(grutatxt:=.in.html)
 gen_html := $(subst web/,web/sync/,$(html_in))
 gen_html := $(gen_html:.in.html=.html)
 gruta_in := $(grutatxt:=.in.html)
@@ -72,7 +73,6 @@ web_pics := web/sync/paraslash.png web/sync/paraslash.ico
 web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \
        key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
 web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \
        key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
-web_man := web/sync/man
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 tarball_delete = web versions pics .changelog_before_cvs .changelog_cvs .gitignore
@@ -82,7 +82,7 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 .PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
        man html_man
 all: $(BINARIES)
 .PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
        man html_man
 all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) $(web_man) \
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) \
        tags doxygen
 gruta: $(gen_html) $(gruta_html)
 man: $(man_pages)
        tags doxygen
 gruta: $(gen_html) $(gruta_html)
 man: $(man_pages)
@@ -167,6 +167,8 @@ man/html/%.html: man/man1/%.1
        mkdir -p man/html
        man2html $< > $@
 
        mkdir -p man/html
        man2html $< > $@
 
+web/%.man.in.html: man/man1/%.1
+       man2html $< | sed -e '/^<\/BODY>/,$$d' -e '1,/<\/HEAD><BODY>/d' > $@
 
 
 ortp_recv.o: ortp_recv.c
 
 
 ortp_recv.o: ortp_recv.c
@@ -272,26 +274,27 @@ web/header2.html: web/header.html
 doxygen: web/header2.html
        mkdir -p web/sync/doxygen
        doxygen
 doxygen: web/header2.html
        mkdir -p web/sync/doxygen
        doxygen
-web/sync/man: html_man
-       mkdir -p $@
-       cp -a $(man_pages_html) $@
 web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
 web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync
+       mkdir -p web/sync
        cat web/header.html $< web/footer.html > $@
        cat web/header.html $< web/footer.html > $@
-web/sync/%.png: pics/web/%.png web/sync
+web/sync/%: pics/web/%
+       mkdir -p web/sync
        cp $< $@
        cp $< $@
-web/sync/%.ico: pics/web/%.ico web/sync
-       cp $< $@
-web/sync/para.css: web/para.css web/sync
+web/sync/%: pics/screenshots/%
+       mkdir -p web/sync
        cp $< $@
        cp $< $@
-web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync
-       cp -a versions web/sync && cp $< $@
-web/sync/overview.pdf: skencil/overview.pdf web/sync
+web/sync/%: web/%
+       mkdir -p web/sync
        cp $< $@
 web/sync/%: %
        cp $< $@
 web/sync/%: %
+       mkdir -p web/sync
        cp -a $< $@
        cp -a $< $@
-web/sync/%: pics/screenshots/%
+web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync
+       cp -a versions web/sync && cp $< $@
+web/sync/overview.pdf: skencil/overview.sk
+       mkdir -p web/sync
        cp $< $@
        cp $< $@
-skencil/%.ps: skencil/%.sk
+%.ps: %.sk
        sk2ps $< > $@
 %.pdf: %.ps
        ps2pdf - - < $< > $@
        sk2ps $< > $@
 %.pdf: %.ps
        ps2pdf - - < $< > $@
diff --git a/web/documentation.in.html b/web/documentation.in.html
index ef34ce9227fd839ba4032a2256e5385cddfb47a0..3cd1fd3a4e44dcbaf951044708da24c49cb3c728 100644 (file)
--- a/web/documentation.in.html
+++ b/web/documentation.in.html
@@ -32,16 +32,16 @@
 <h2> Manual pages </h2>
 
 <p>
 <h2> Manual pages </h2>
 
 <p>
-       [<a href="man/para_server.html">para_server</a>]
-       [<a href="man/para_audiod.html">para_audiod</a>]
-       [<a href="man/para_client.html">para_client</a>]
-       [<a href="man/para_audioc.html">para_audioc</a>]
-       [<a href="man/para_fsck.html">para_write</a>]
-       [<a href="man/para_recv.html">para_recv</a>]
-       [<a href="man/para_filter.html">para_filter</a>]
-       [<a href="man/para_write.html">para_write</a>]
-       [<a href="man/para_gui.html">para_gui</a>]
-       [<a href="man/para_fade.html">para_fade</a>]
+       [<a href="para_server.man.html">para_server</a>]
+       [<a href="para_audiod.man.html">para_audiod</a>]
+       [<a href="para_client.man,html">para_client</a>]
+       [<a href="para_audioc.man.html">para_audioc</a>]
+       [<a href="para_fsck.man.html">para_write</a>]
+       [<a href="para_recv.man.html">para_recv</a>]
+       [<a href="para_filter.man.html">para_filter</a>]
+       [<a href="para_write.man.html">para_write</a>]
+       [<a href="para_gui.man.html">para_gui</a>]
+       [<a href="para_fade.man.html">para_fade</a>]
 </p>
 
 <h2> Source code documentation </h2>
 </p>
 
 <h2> Source code documentation </h2>
paraslash - network audio streaming tools