Changeset 154:f4e4dbc1d467 in lemon-main

Timestamp:

04/28/08 12:12:33 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

149:2f7ae34e1333 (diff), 153:976a014b3797 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• .hgignore (modified) (2 diffs)
• .hgignore (modified) (1 diff)
• doc/Makefile.am (modified) (2 diffs)
• doc/Makefile.am (modified) (1 diff)

.hgignore

@@ -8 +8 @@
 *.lo
 *.tar.*
+*.bak
 Makefile.in
 aclocal.m4
@@ -26 +27 @@
 .deps/*
 demo/*.eps
+doc/images/*.png
 
 syntax: regexp

.hgignore

@@ -37 +37 @@
 ^test/[a-z_]*$
 ^demo/.*_demo$
+^build/.*
+CMakeFiles
+DartTestfile.txt
+cmake_install.cmake
+CMakeCache.txt

doc/Makefile.am

@@ -9 +9 @@
         doc/html
 
+DOC_EPS_IMAGES18 = \
+        nodeshape_0.eps \
+        nodeshape_1.eps \
+        nodeshape_2.eps \
+        nodeshape_3.eps \
+        nodeshape_4.eps
+
+DOC_EPS_IMAGES = \
+        $(DOC_EPS_IMAGES18)
+
+DOC_PNG_IMAGES = \
+        $(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png)
+
+EXTRA_DIST += $(DOC_EPS_IMAGES:%=doc/images/%)
+
 doc/html:
         $(MAKE) $(AM_MAKEFLAGS) html
 
-html-local:
+GS_COMMAND=gs -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4
+
+$(DOC_EPS_IMAGES18:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
+        -mkdir doc/gen-images
+        if test ${gs_found} = yes; then \
+          $(GS_COMMAND) -sDEVICE=pngalpha -r18 -sOutputFile=$@ $<; \
+        else \
+          echo; \
+          echo "Ghostscript not found."; \
+          echo; \
+          exit 1; \
+        fi
+
+html-local: $(DOC_PNG_IMAGES)
         if test ${doxygen_found} = yes; then \
           cd doc; \
@@ -27 +55 @@
         -rm -rf doc/html
         -rm -f doc/doxygen.log
+        -rm -f $(DOC_PNG_IMAGES)
+        -rm -rf doc/gen-images
 
 update-external-tags:

doc/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
-        doc/Makefile \
         doc/Doxyfile.in \
         doc/coding_style.dox \