bo: doc/kolab-formats .cvsignore,1.1,1.2 Makefile,1.2,1.3

[cvs at intevation.de]

Author: bo

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv1556

Modified Files:
	.cvsignore Makefile 
Log Message:
Clean up Makefile and be able to produce html again

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	10 Jun 2004 15:15:52 -0000	1.1
+++ .cvsignore	6 Jul 2004 11:00:13 -0000	1.2
@@ -8,3 +8,5 @@
 suse-html.dsl
 suse-print.dsl
 CATALOG.local
+kolabformat
+kolabformat.rtf

Index: Makefile
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	6 Jul 2004 10:49:10 -0000	1.2
+++ Makefile	6 Jul 2004 11:00:13 -0000	1.3
@@ -4,15 +4,17 @@
 #
 # Author(s):  Martin Konold <konold at erfrakon.de>
 # 	      Bernhard Reiter <bernhard at intevatin.de>
+#             Bo Thorsen <bo at sonofthor.dk>
 #
 # Known to run on Debian GNU/Linux with docbook-utils(0.6.13-2) and (0.6.13-4).
 
 NAME=		kolabformat
-HTML_DEST_DIR=	kolabformat
+HTML_DEST_DIR=	$(NAME)
 SHELL=		/bin/bash
 SGML_SRC=	$(NAME).sgml 
-INCLUDED_SRCS=	overview.sgml folders.sgml mail.sgml commonfields.sgml \
-	notes.sgml contacts.sgml journals.sgml events.sgml tasks.sgml
+SOURCES=	$(SGML_SRC) overview.sgml folders.sgml mail.sgml \
+		commonfields.sgml notes.sgml contacts.sgml journals.sgml \
+		events.sgml tasks.sgml
 
 HTML_DST=	$(HTML_DEST_DIR)/index.html
 PS_DST=		$(NAME).ps
@@ -24,37 +26,28 @@
 #PS_CMD=		db2ps -j -f/dev/null
 PS_CMD=		db2ps 
 #PDF_CMD=	db2pdf -j -f/dev/null
+PDF_CMF=	ps2pdf
 RTF_CMD=	db2rtf
 
 
-all: ps pdf
+all: ps pdf html rtf
 
 html: $(HTML_DST)
 ps:   $(PS_DST)
 pdf: $(PDF_DST)
 rtf: $(RTF_DST)
 
-concept/index.html: $(SGML_SRC) $(INCLUDED_SRCS)
+$(HTML_DST): $(SGML_SRC) $(INCLUDED_SRCS)
 	$(HTML_CMD) $(SGML_SRC)
-	cp erfrakon.png $(HTML_DEST_DIR)/
-	mv $(HTML_DEST_DIR)/index.html $(HTML_DEST_DIR)/index.html.tmp
-	cat $(HTML_DEST_DIR)/index.html.tmp | sed -e 's/SRC=\"erfrakon\"/SRC=\"erfrakon\.png\"/g' > $(HTML_DEST_DIR)/index.html
-	rm $(HTML_DEST_DIR)/index.html.tmp
 
-$(NAME).ps: $(SGML_SRC) $(INCLUDED_SRCS)
+$(PS_DST): $(SGML_SRC) $(INCLUDED_SRCS)
 	$(PS_CMD) $(SGML_SRC)
 
-$(NAME).pdf: $(NAME).ps
-	ps2pdf $(NAME).ps
+$(PDF_DST): $(PS_DST)
+	$(PDF_CMD) $(PS_DST)
 
-$(NAME).rtf: $(SGML_SRC) $(INCLUDED_SRCS)
-	echo '**************'
-	echo Keep in mind that "erfrakon.png" is referenced in the rtf file.
-	echo
+$(RTF_DST): $(SGML_SRC) $(INCLUDED_SRCS)
 	$(RTF_CMD) $<
-	mv $(NAME).rtf $(NAME).rtf.tmp
-	cat $(NAME).rtf.tmp | sed -e 's/INCLUDEPICTURE \"erfrakon\"/INCLUDEPICTURE \"erfrakon.png\"/g' >$(NAME).rtf
-	rm $(NAME).rtf.tmp
 
 clean:
 	rm -f *.tex *.dvi *.aux *.log