COIN-OR::LEMON - Graph Library

Changeset 154:f4e4dbc1d467 in lemon-1.2


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • .hgignore

    r141 r154  
    88*.lo
    99*.tar.*
     10*.bak
    1011Makefile.in
    1112aclocal.m4
     
    2627.deps/*
    2728demo/*.eps
     29doc/images/*.png
    2830
    2931syntax: regexp
  • .hgignore

    r153 r154  
    3737^test/[a-z_]*$
    3838^demo/.*_demo$
     39^build/.*
     40CMakeFiles
     41DartTestfile.txt
     42cmake_install.cmake
     43CMakeCache.txt
  • doc/Makefile.am

    r146 r154  
    99        doc/html
    1010
     11DOC_EPS_IMAGES18 = \
     12        nodeshape_0.eps \
     13        nodeshape_1.eps \
     14        nodeshape_2.eps \
     15        nodeshape_3.eps \
     16        nodeshape_4.eps
     17
     18DOC_EPS_IMAGES = \
     19        $(DOC_EPS_IMAGES18)
     20
     21DOC_PNG_IMAGES = \
     22        $(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png)
     23
     24EXTRA_DIST += $(DOC_EPS_IMAGES:%=doc/images/%)
     25
    1126doc/html:
    1227        $(MAKE) $(AM_MAKEFLAGS) html
    1328
    14 html-local:
     29GS_COMMAND=gs -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4
     30
     31$(DOC_EPS_IMAGES18:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
     32        -mkdir doc/gen-images
     33        if test ${gs_found} = yes; then \
     34          $(GS_COMMAND) -sDEVICE=pngalpha -r18 -sOutputFile=$@ $<; \
     35        else \
     36          echo; \
     37          echo "Ghostscript not found."; \
     38          echo; \
     39          exit 1; \
     40        fi
     41
     42html-local: $(DOC_PNG_IMAGES)
    1543        if test ${doxygen_found} = yes; then \
    1644          cd doc; \
     
    2755        -rm -rf doc/html
    2856        -rm -f doc/doxygen.log
     57        -rm -f $(DOC_PNG_IMAGES)
     58        -rm -rf doc/gen-images
    2959
    3060update-external-tags:
  • doc/Makefile.am

    r153 r154  
    11EXTRA_DIST += \
    2         doc/Makefile \
    32        doc/Doxyfile.in \
    43        doc/coding_style.dox \
Note: See TracChangeset for help on using the changeset viewer.