--- a/Makefile	Fri Feb 15 03:14:34 2008 -0500
+++ b/Makefile	Sun Feb 17 04:10:14 2008 -0500
@@ -8,16 +8,15 @@
 SRCS=cda.xml
 FOP=fop
 NWALSH_XSL_DIR=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-OO_PDF_OUTPUT_DIR=$(HOME)/pdf
 
-PDF_OUTPUT=cda-perso.pdf cda-perso-alt.pdf presentation.pdf
-OUTPUT=$(foreach target,$(basename $(SRCS)),$(call output,$(target))) \
-	$(PDF_OUTPUT)
-UPLOAD=$(OUTPUT) cda-perso.sxw cda-perso-alt.sxw presentation.sxi index.fr.html blason.png
+OUTPUT=$(foreach target,$(basename $(SRCS)),$(call output,$(target)))
+UPLOAD=$(OUTPUT) cda.xml cda-perso.odt cda-perso-vierge.odt presentation.odp \
+	cda-perso-vierge.pdf presentation.pdf presentation.swf \
+	index.fr.html blason.png
 xml_validate=xmllint --xinclude --noout $(1)
 html_validate=$(call xml_validate,$(1))
 
-all: $(basename $(SRCS)) $(PDF_OUTPUT)
+all: $(basename $(SRCS))
 
 # Should I need to validate other file? Can I?
 validate: $(addsuffix -validate, $(SRCS) index.fr.html)
@@ -43,14 +42,6 @@
 	fop $< $@
 #	rm $@.tmp.fo
 
-%.pdf: %.sxw
-	xvfb-run -a oowriter2 -pt PDF $<
-	mv $(OO_PDF_OUTPUT_DIR)/$@ $@
-
-%.pdf: %.sxi
-	xvfb-run -a ooimpress2 -pt PDF $<
-	mv $(OO_PDF_OUTPUT_DIR)/$@ $@
-
 %.html: %.xml html.xsl common.xsl
 	xsltproc --xinclude -o $@ html.xsl $<
 #	recode u8..l1 $@
@@ -64,9 +55,14 @@
 	w3m -dump $< > $@
 
 install: $(UPLOAD)
+	-rm -rf $(INSTALL_DIR)
 	-mkdir -p $(INSTALL_DIR)
 	cp -a $^ $(INSTALL_DIR)
 
+upload: install
+	rsync -avzPc --delete install/ o.tzone.org:/var/www/harmonies/CC/cda/
+	ssh o.tzone.org ln -s index.fr.html /var/www/harmonies/CC/cda/index.html
+
 clean:
 	rm -f *~ *.fo