[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-217-ga8295ba)
The branch, master has been updated
via a8295ba6d957394c9d56465bc2bfc14a43fc251d (commit)
via e890e7c806dbd5bcd311ad5cd201a7f5ec31dcec (commit)
from 6726beb5c3e3d30ade6d486d8760fc789118d1eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
configure.ac | 1 +
gschem/docs/.gitignore | 1 +
libgeda/docs/Makefile.am | 2 ++
libgeda/docs/images/{Makefile => Makefile.am} | 6 +++---
utils/man/.gitignore | 1 +
5 files changed, 8 insertions(+), 3 deletions(-)
rename libgeda/docs/images/{Makefile => Makefile.am} (78%)
=================
Commit Messages
=================
commit a8295ba6d957394c9d56465bc2bfc14a43fc251d
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>
Added some machine generated documentation files to be ignored
:100644 100644 057ed0a... 8a8d8cf... M gschem/docs/.gitignore
:100644 100644 23c1897... a4caef1... M utils/man/.gitignore
commit e890e7c806dbd5bcd311ad5cd201a7f5ec31dcec
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>
Added libgeda/docs/images to the build system
Unfortunately automake complains when creating libgeda/docs/Makefile.in:
`%'-style pattern rules are a GNU make extension
It will be interesting to see if this causes anybody problems.
:100644 100644 c6cdccf... 82ebbe4... M configure.ac
:100644 100644 c916658... cf54fe9... M libgeda/docs/Makefile.am
:100644 000000 b88ac01... 0000000... D libgeda/docs/images/Makefile
:000000 100644 0000000... 8a654ea... A libgeda/docs/images/Makefile.am
=========
Changes
=========
commit a8295ba6d957394c9d56465bc2bfc14a43fc251d
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>
Added some machine generated documentation files to be ignored
diff --git a/gschem/docs/.gitignore b/gschem/docs/.gitignore
index 057ed0a..8a8d8cf 100644
--- a/gschem/docs/.gitignore
+++ b/gschem/docs/.gitignore
@@ -3,3 +3,4 @@ Makefile.in
latex
html
*~
+gschem.html
diff --git a/utils/man/.gitignore b/utils/man/.gitignore
index 23c1897..a4caef1 100644
--- a/utils/man/.gitignore
+++ b/utils/man/.gitignore
@@ -1,3 +1,4 @@
Makefile
Makefile.in
*~
+grenum.html
commit e890e7c806dbd5bcd311ad5cd201a7f5ec31dcec
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Commit: Ales Hvezda <ahvezda@xxxxxxxx>
Added libgeda/docs/images to the build system
Unfortunately automake complains when creating libgeda/docs/Makefile.in:
`%'-style pattern rules are a GNU make extension
It will be interesting to see if this causes anybody problems.
diff --git a/configure.ac b/configure.ac
index c6cdccf..82ebbe4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,7 @@ AC_CONFIG_FILES([Makefile
libgeda/po/Makefile.in
libgeda/data/Makefile
libgeda/docs/Makefile
+ libgeda/docs/images/Makefile
libgeda/include/Makefile
libgeda/lib/Makefile
libgeda/scheme/Makefile
diff --git a/libgeda/docs/Makefile.am b/libgeda/docs/Makefile.am
index c916658..cf54fe9 100644
--- a/libgeda/docs/Makefile.am
+++ b/libgeda/docs/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = images
+
EXTRA_DIST = libgeda-main.txt what-is-geda.html \
what-is-libgeda.html logo.png libgeda.dox
diff --git a/libgeda/docs/images/Makefile b/libgeda/docs/images/Makefile
deleted file mode 100644
index b88ac01..0000000
--- a/libgeda/docs/images/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-svg_images = \
- o_attrib_overview.svg \
- o_object_relations.svg \
- o_text_font_overview.svg \
- o_text_text_overview.svg \
- s_conn_overview.svg \
- s_page_overview.svg \
- s_tile_overview.svg
-
-
-png_images = $(patsubst %.svg, %.png, $(svg_images))
-pdf_images = $(patsubst %.svg, %.pdf, $(svg_images))
-
-
-all: $(png_images) $(pdf_images)
-
-clean:
- rm -rf $(png_images) $(pdf_images)
-
-%.png: %.svg
- inkscape -e $@ $< || convert $< $@
-
-%.pdf: %.svg
- inkscape -A $@ $< || convert $< $@
-
diff --git a/libgeda/docs/images/Makefile.am b/libgeda/docs/images/Makefile.am
new file mode 100644
index 0000000..8a654ea
--- /dev/null
+++ b/libgeda/docs/images/Makefile.am
@@ -0,0 +1,26 @@
+
+svg_images = \
+ o_attrib_overview.svg \
+ o_object_relations.svg \
+ o_text_font_overview.svg \
+ o_text_text_overview.svg \
+ s_conn_overview.svg \
+ s_page_overview.svg \
+ s_tile_overview.svg
+
+EXTRA_DIST = $(svg_images)
+
+png_images = $(EXTRA_DIST:.svg=.png)
+pdf_images = $(EXTRA_DIST:.svg=.pdf)
+
+all: $(png_images) $(pdf_images)
+
+clean:
+ rm -rf $(png_images) $(pdf_images)
+
+%.png: %.svg
+ inkscape -e $@ $< || convert $< $@
+
+%.pdf: %.svg
+ inkscape -A $@ $< || convert $< $@
+
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs