[gtk-doc] style: group files we redistribute with the generated docs
- From: Stefan Kost <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] style: group files we redistribute with the generated docs
- Date: Tue, 4 Feb 2014 21:19:09 +0000 (UTC)
commit d86bb8b7bea058b8e53f6e521839d989f285eaf3
Author: Stefan Sauer <ensonic users sf net>
Date: Tue Feb 4 20:20:09 2014 +0100
style: group files we redistribute with the generated docs
Add a style directory and move the images + the css there. Add a COPYING file to
clarify their license.
Makefile.am | 33 +---
gtkdoc-mkhtml.in | 7 +-
style-classic.css | 212 --------------------
style/COPYING | 17 ++
home.png => style/home.png | Bin 256 -> 256 bytes
left-insensitive.png => style/left-insensitive.png | Bin 395 -> 395 bytes
left.png => style/left.png | Bin 262 -> 262 bytes
.../right-insensitive.png | Bin 373 -> 373 bytes
right.png => style/right.png | Bin 261 -> 261 bytes
style.css => style/style.css | 0
up-insensitive.png => style/up-insensitive.png | Bin 374 -> 374 bytes
up.png => style/up.png | Bin 260 -> 260 bytes
12 files changed, 30 insertions(+), 239 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4c6b811..ae030df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,14 +34,14 @@ gtkdocdata_DATA = \
gtk-doc.notmpl.make \
gtk-doc.flat.make \
gtk-doc.notmpl-flat.make \
- home.png \
- left.png \
- left-insensitive.png \
- right.png \
- right-insensitive.png \
- up.png \
- up-insensitive.png \
- style.css
+ style/home.png \
+ style/left.png \
+ style/left-insensitive.png \
+ style/right.png \
+ style/right-insensitive.png \
+ style/up.png \
+ style/up-insensitive.png \
+ style/style.css
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = gtk-doc.pc
@@ -60,28 +60,14 @@ gtk-doc.notmpl-flat.make: gtk-doc.notmpl.make
EXTRA_DIST = \
MAINTAINERS \
+ $(gtkdocdata_DATA) \
gtk-doc.pc.in \
gtk-doc.m4 \
- gtk-doc.make \
- gtk-doc.notmpl.make \
- gtk-doc.flat.make \
- gtk-doc.notmpl-flat.make \
gtk-doc.doap \
gtk-doc.spec.in \
gtk-doc.spec \
- gtk-doc.dcl \
- gtk-doc.xsl \
gtk-doc-fo.xsl \
- version-greater-or-equal.xsl \
- devhelp2.xsl \
gtk-doc.cat.in \
- home.png \
- left.png \
- left-insensitive.png \
- right.png \
- right-insensitive.png \
- up.png \
- up-insensitive.png \
doc/README \
doc/authors.txt \
doc/gnome.txt \
@@ -95,7 +81,6 @@ EXTRA_DIST = \
examples/Makefile.am \
tools/docpercentages.pl \
tools/gtk-doc.el \
- style.css \
COPYING-DOCS
MAINTAINERCLEANFILES = \
diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
index 8c4af98..13256fc 100644
--- a/gtkdoc-mkhtml.in
+++ b/gtkdoc-mkhtml.in
@@ -51,19 +51,21 @@ fi
if test $uninstalled = yes; then
# this does not work from buiddir!=srcdir
gtkdocdir=`dirname $0`
- # traditional Bourne shells may not support -e here, use -f
+ # traditional Bourne shells may not support -e here, use -f
if test ! -f $gtkdocdir/gtk-doc.xsl; then
# try to src dir (set from makefiles) too
if test -f $ABS_TOP_SRCDIR/gtk-doc.xsl; then
gtkdocdir=$ABS_TOP_SRCDIR
fi
fi
+ styledir=$gtkdocdir/style
#echo "uninstalled, gtkdocdir=$gtkdocdir, cwd=$PWD"
else
# the first two are needed to resolve datadir
prefix= prefix@
datarootdir= datarootdir@
gtkdocdir= datadir@/gtk-doc/data
+ styledir=$gtkdocdir
fi
if head -n 1 $document | grep "<?xml" > /dev/null; then
@@ -106,8 +108,7 @@ else
fi
# copy navigation images and stylesheets to html directory ...
-cp -f $gtkdocdir/*.png ./
-cp -f $gtkdocdir/*.css ./
+cp -f $styledir/*.png $styledir/*.css ./
echo "timestamp" > ../html.stamp
diff --git a/style/COPYING b/style/COPYING
new file mode 100644
index 0000000..bf8a8b3
--- /dev/null
+++ b/style/COPYING
@@ -0,0 +1,17 @@
+This style subdirectory of this package contains a number of images and a css
+stylesheet used in the formatted output.
+
+The images were created primarily by William Jon McCann in these commits
+* 939576cd24da19e15eed97c937480514eb373669
+* 0fab530ad580011d8fee87755a37d180392e9970
+
+The stylesheet was added by Matthias Clasen in commit
+* 07971801371971f69b03c190d91aab4e5177e5c5
+
+These images and the stylesheet are licensed under the terms of the GNU GPL.
+
+As a special exception to the GNU General Public License, if you distribute
+copies of your document formatted by the tools in this package, you may
+redistribute unmodified copies of any images and style sheets used or
+referenced in that formatted copy without restriction.
+
diff --git a/style.css b/style/style.css
similarity index 100%
rename from style.css
rename to style/style.css
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]