Clean up .gitignore and documentation build rules.

.gitignore

@@ -1,3 +1,4 @@
+# Autotools cruft
 *.o
 *.lo
 *.la
@@ -23,3 +24,67 @@ stamp-*
 *-stamp
 INSTALL
 caca-config
+# libcaca binaries
+caca/caca_types.h
+# caca-sharp binaries
+caca-sharp/*.dll
+caca-sharp/*.config
+caca-sharp/*.mdb
+# libcaca++ binaries
+cxx/cxxtest
+# Doxygen cruft
+doc/doxygen.cfg
+doc/doxygen.log
+doc/man
+doc/html
+doc/latex
+# example binaries
+examples/blit
+examples/canvas
+examples/colors
+examples/conio
+examples/conio-snake
+examples/demo
+examples/demo0
+examples/dithering
+examples/driver
+examples/event
+examples/export
+examples/figfont
+examples/font
+examples/font2tga
+examples/frames
+examples/fullwidth
+examples/gamma
+examples/hsv
+examples/import
+examples/input
+examples/mouse
+examples/spritedit
+examples/swallow
+examples/term
+examples/text
+examples/transform
+examples/trifiller
+examples/truecolor
+examples/unicode
+# Ruby binaries
+ruby/*/mkmf.log
+ruby/*/*.so
+# Demo binaries
+src/cacaview
+src/cacadraw
+src/cacademo
+src/cacafire
+src/cacaplay
+src/cacaserver
+src/img2txt
+# Testsuite binaries
+test/bench
+test/caca-test
+test/simple
+# Tools binaries
+tools/optipal
+tools/makefont
+tools/sortchars
+

Makefile.am

@@ -12,6 +12,7 @@ bin_SCRIPTS = caca-config
 
 webhost = poulet.zoy.org
 webdir = /srv/caca.zoy.org/var/www/
+doxdir = /srv/caca.zoy.org/var/cache/doxygen/libcaca
 
 upload: upload-source upload-doc
 
@@ -19,8 +20,8 @@ upload-source: FORCE
 	scp $(distdir).tar.gz $(webhost):$(webdir)/files/
 
 upload-doc: doc/html FORCE
-	ssh $(webhost) rm -f '$(webdir)/manual/*'
-	scp -r doc/html/* $(webhost):$(webdir)/manual/
+	ssh $(webhost) rm -f '$(doxdir)/*' || true
+	scp -r doc/html/* $(webhost):$(doxdir)/
 
 fonts: tools/makefont
 	tools/makefont mono9 "Monospace 9" 96 4 >| $(srcdir)/caca/mono9.data

caca-sharp/.gitignore

@@ -1,3 +0,0 @@
-*.dll
-*.config
-*.mdb

caca/.gitignore

@@ -1 +0,0 @@
-caca_types.h

cxx/.gitignore

@@ -1 +0,0 @@
-cxxtest

doc/.gitignore

@@ -1,4 +0,0 @@
-doxygen.cfg
-man
-html
-latex

doc/Makefile.am

@@ -2,6 +2,7 @@
 
 EXTRA_DIST = doxygen.cfg.in doxygen.css footer.html header.html \
              $(man_MANS) $(doxygen_DOX)
+CLEANFILES = doxygen.log stamp-latex stamp-doxygen
 
 doxygen_DOX = libcaca.dox user.dox migrating.dox tutorial.dox canvas.dox font.dox style.dox
 man_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1
@@ -20,7 +21,7 @@ latex/libcaca.pdf: stamp-latex
 
 stamp-doxygen: $(doxygen_DOX)
 if BUILD_DOCUMENTATION
-	doxygen doxygen.cfg
+	doxygen doxygen.cfg 2>&1 | tee doxygen.log
 	touch stamp-doxygen
 endif
 
@@ -36,10 +37,8 @@ if USE_LATEX
 endif
 endif
 
-clean: clean-local
 clean-local:
 	-rm -Rf html latex man
-	-rm -f stamp-latex stamp-doxygen
 
 install-data-local:
 if BUILD_DOCUMENTATION
@@ -53,10 +52,10 @@ if BUILD_DOCUMENTATION
 	  sed -e 's/man3caca/man3/g' -e "s/fC'\([a-zA-Z0-9]*\)'/fC\"\1\"/g" \
 	    $$man >$(DESTDIR)$(mandir)/man3/$${man##*/}; \
 	done
+endif
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
 	rm -f $(DESTDIR)$(mandir)/man1/cacademo.1
 	ln -sf cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
-endif
 
 uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/doc/libcucul-dev

doc/doxygen.cfg.in

@@ -946,7 +946,7 @@ DISABLE_INDEX          = YES
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.
 
-ENUM_VALUES_PER_LINE   = 4
+ENUM_VALUES_PER_LINE   = 1
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
 # structure should be generated to display hierarchical information. 

examples/.gitignore

@@ -1,29 +0,0 @@
-blit
-canvas
-colors
-conio
-conio-snake
-demo
-demo0
-dithering
-driver
-event
-export
-figfont
-font
-font2tga
-frames
-fullwidth
-gamma
-hsv
-import
-input
-mouse
-spritedit
-swallow
-term
-text
-transform
-trifiller
-truecolor
-unicode

ruby/.gitignore

@@ -1,2 +0,0 @@
-*/mkmf.log
-*/*.so

src/.gitignore

@@ -1,7 +0,0 @@
-cacaview
-cacadraw
-cacademo
-cacafire
-cacaplay
-cacaserver
-img2txt

test/.gitignore

@@ -1,3 +0,0 @@
-bench
-caca-test
-simple

test/check-build

@@ -47,6 +47,17 @@ else
   echo "0 errors in source code"
 fi
 
+#
+# Check for Doxygen errors
+#
+warnings="$(grep -c Warning: ../doc/doxygen.log)"
+if test "$warnings" != "0"; then
+  echo "error: $warnings warnings in Doxygen generation"
+  ret=1
+else
+  echo "0 errors in documentation"
+fi
+
 if test "$ret" != "0"; then
   exit 1
 fi

tools/.gitignore

@@ -1,3 +0,0 @@
-optipal
-makefont
-sortchars