2002-10-28 Theodore A. Roth * configure.in: Fix typo. Update my email address. Add CHECK_PNG_UTILS. * doc/api/Makefile.am: Add png and eps files to clean list. Add transparency to png images. * doc/examples/demo/Makefile: Add transparency to png images. Index: configure.in =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/configure.in,v retrieving revision 1.37 diff -u -r1.37 configure.in --- configure.in 23 Oct 2002 05:16:53 -0000 1.37 +++ configure.in 28 Oct 2002 22:39:00 -0000 @@ -153,9 +153,8 @@ AC_PROG_INSTALL - dnl troth/2002-07-12: The CHECK_DOXYGEN macro should be moved to a config -dnl dir. I put it here until I figure out who to integrate the config dir. +dnl dir. I put it here until I figure out how to integrate the config dir. dnl dnl @synopsis CHECK_DOXYGEN @@ -163,7 +162,7 @@ dnl This macro checks if doxygen is installed on the build system dnl dnl @version Id: check_doxygen.m4,v 1.2 2002/02/10 23:22:40 troth Exp -dnl @author Theodore A. Roth +dnl @author Theodore A. Roth dnl AC_DEFUN(CHECK_DOXYGEN,[dnl dnl @@ -197,6 +196,54 @@ ])dnl CHECK_DOXYGEN + +dnl +dnl @synopsis CHECK_PNG_UTILS +dnl +dnl This macro checks if pngtopnm and pnmtopng are installed. If they are not +dnl installed we just fake it with "cat". +dnl +dnl We use these in the dox to insert transparency into the png images as such: +dnl +dnl $ pngtopnm foo.png > tmp.pnm +dnl $ pnmtopng -transparent white tmp.pnm > foo.png +dnl +dnl @version Id: check_doxygen.m4,v 1.2 2002/02/10 23:22:40 troth Exp +dnl @author Theodore A. Roth +dnl +AC_DEFUN(CHECK_PNG_UTILS,[dnl +dnl +AC_MSG_CHECKING(for pngtopnm) +has_pngtopnm=`pngtopnm --version 2>&1 | grep -c Version` +if test "$has_pngtopnm" = "1"; then + AC_MSG_RESULT(yes) + PNGTOPNM="pngtopnm" +else + AC_MSG_RESULT(no) + PNGTOPNM="cat" +fi +dnl +AC_MSG_CHECKING(for pngtopnm) +has_pnmtopng=`pnmtopng --version 2>&1 | grep -c Version` +if test "$has_pnmtopng" = "1"; then + AC_MSG_RESULT(yes) + PNMTOPNG="pnmtopng" +else + AC_MSG_RESULT(no) + PNMTOPNG="cat" +fi +dnl +dnl pnmtopng will fail if the input file is a png instead of a pnm. +dnl +if test "$PNMTOPNG" = "cat"; then + PNGTOPNM="cat" +fi +dnl +AC_SUBST(PNGTOPNM) +AC_SUBST(PNMTOPNG) +])dnl + +CHECK_PNG_UTILS if test "$versioned_doc" = "yes"; then DOC_INST_DIR='$(DESTDIR)$(datadir)/doc/avr-libc-$(VERSION)' Index: doc/api/Makefile.am =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/doc/api/Makefile.am,v retrieving revision 1.24 diff -u -r1.24 Makefile.am --- doc/api/Makefile.am 28 Oct 2002 17:45:54 -0000 1.24 +++ doc/api/Makefile.am 28 Oct 2002 22:39:00 -0000 @@ -32,7 +32,8 @@ # MAINTAINERCLEANFILES = Makefile.in stamp-vti -CLEANFILES = *.html *.pdf *.ma *.mas *.ps doxygen-pdf.config +CLEANFILES = *.html *.pdf *.ma *.mas *.ps doxygen-pdf.config \ + *.png *.eps EXTRA_DIST = dox.css dox_html_header dox_html_footer \ main_page.dox \ @@ -75,6 +76,8 @@ .fig.png: $(FIG2DEV) -L png $< $@ + $(PNGTOPNM) $@ > tmp.pnm + $(PNMTOPNG) -transparent white tmp.pnm >$@ && rm tmp.pnm IMAGE_SRC= malloc-std.fig malloc-x1.fig malloc-x2.fig Index: doc/examples/demo/Makefile =================================================================== RCS file: /cvsroot/avr-libc/avr-libc/doc/examples/demo/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- doc/examples/demo/Makefile 30 Sep 2002 18:16:07 -0000 1.1 +++ doc/examples/demo/Makefile 28 Oct 2002 22:39:00 -0000 @@ -70,6 +70,8 @@ # by the casual user. FIG2DEV = fig2dev +PNGTOPNM = pngtopnm +PNMTOPNG = pnmtopng EXTRA_CLEAN_FILES = *.hex *.bin *.srec dox: eps png pdf @@ -86,3 +88,6 @@ %.png: %.fig $(FIG2DEV) -L png $< $@ + $(PNGTOPNM) $@ > tmp.pnm + $(PNMTOPNG) -transparent white tmp.pnm >$@ && rm tmp.pnm +