--- trunk/Makefile	2005/07/06 16:44:46	34
+++ trunk/Makefile	2006/08/07 23:24:54	76
@@ -1,14 +1,13 @@
 dir=`pwd`
 code=pgest
 
-all: pgest install
+pod2html=pod2xhtml.pl --top ''
+cite2href=sed -e 's!<cite>\([^>]*\)</cite>!<a href=\"\1.html\">\1</a>!g'
+
+all: install
 	psql test < pgest.sql
 	cat test.sql | sed "s,##dir##,${dir}," | psql test
 
-pgest:
-	cc -I`pg_config --includedir-server` -fpic -c ${code}.c `estconfig --cflags`
-	cc -shared `estconfig --ldflags` `estconfig --libs` -o ${code}.so ${code}.o
-
 clean:
 	rm -Rf data/casket *.o *.so doc
 
@@ -23,9 +22,20 @@
 
 html:
 	test -d doc || mkdir doc
-	pod2xhtml.pl --top '' < README.pod > doc/pgestraier.html
-	svn update && svn2html.pl > doc/ChangeLog.html
+	${pod2html} < Tutorial.pod | ${cite2href} > doc/Tutorial.html
+	${pod2html} < README.pod | ${cite2href} > doc/pgestraier.html
+	${pod2html} < bin/pgest-index.pl | ${cite2href} > doc/pgest-index.html
+	svk update && svn2html.pl > doc/ChangeLog.html
 
-cvs:
+cvs: html
 	svn2cvs.pl file:///home/dpavlin/private/svn/pgestraier/trunk/ :ext:dpavlin@cvs.pgfoundry.org:/cvsroot/pgestraier pgestraier
-	rsync doc/pgestraier.html pgfoundry.org:/home/pgfoundry.org/groups/pgestraier/htdocs/index.html
+	test -d doc && rsync -ra doc/ pgfoundry.org:/home/pgfoundry.org/groups/pgestraier/htdocs/ && ssh pgfoundry.org ln -sf /home/pgfoundry.org/groups/pgestraier/htdocs/pgestraier.html /home/pgfoundry.org/groups/pgestraier/htdocs/index.html || true
+
+%.o: %.c
+	@echo $@ $< $^
+	cc -Wall -I`pg_config --includedir-server` -fpic -c $< `estconfig --cflags || pkg-config hyperestraier --cflags`
+
+%.so: %.o
+	@echo $@ $< $^
+	cc -shared `estconfig --ldflags` `estconfig --libs` -o $@ $<
+