bessere Namensgebung

documents/Makefile

@@ -10,7 +10,7 @@ LINE_STATUS = offline
 LATEX2HTMLPREFIX := -no_auto_link -split 0 -no_navigation -no_subdir -dir _output
 
 
-.PHONY : clean online offline clean-targets create-dirs install
+.PHONY : clean online offline clean-targets install
 
 # default target (offline)
 all: $(HTML_FILES)
@@ -21,29 +21,29 @@ install: $(TARGET_FILES)
 	@[ ! -e "$(CCD_BUILD_DIR)/doku" ] && mkdir "$(CCD_BUILD_DIR)/doku"
 	@cp _output/* "$(CCD_BUILD_DIR)/doku"
 
-create-dirs:
-	@[ ! -e "_output" ] && mkdir _output
 
 clean-targets:
 	-rm $(TARGET_FILES) 2>/dev/null
 
-online	: LINE_STATUS=online
-offline	: LINE_STATUS=offline
+online:	 LINE_STATUS=online
+offline: LINE_STATUS=offline
 online offline: clean-targets $(TARGET_FILES)
 
 $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES)
-	cat header.asc nav.asc.$(LINE_STATUS) $(notdir $(basename $@))/$(notdir $@) footer.asc >$@
+	cat header.asc nav.$(LINE_STATUS).asc $(notdir $(basename $@))/$(notdir $@) footer.asc >$@
 
 
 # create tex files from lyx
 $(TEX_FILES): %.tex: %.lyx
 	lyx -e latex $*.lyx
 
+
 # original html-files, as they are created by lyx
-$(HTML_FILES): create-dirs %.html: %.tex 
+$(HTML_FILES): %.html: %.tex 
+	@-[ ! -e "_output" ] && mkdir _output
 	latex2html $(LATEX2HTMLPREFIX) $*.tex
 	# die html-Datei wurde jetzt im _output-Verzeichnis erstellt (inklusive Bilder)
-	-rm _output/WARNINGS $*-labels.pl $*-internals.pl 2>/dev/null
+	-rm _output/WARNINGS $*-labels.pl $*-internals.pl $*.log 2>/dev/null
 	-rm _output/$(notdir $(basename $@)).css 2>/dev/null
 	-rm _output/images.aux _output/images.log _output/images.out _output/images.pl _output/images.text _output/img?.old _output/labels.pl _output/missfont.log _output/images.tex 2>/dev/null
 	mv _output/$(shell dirname $@).html $@
@@ -51,10 +51,9 @@ $(HTML_FILES): create-dirs %.html: %.tex
 
 
 clean:
-	-rm WARNINGS 2>/dev/null
 	-rm $(TEX_FILES) 2>/dev/null
 	-rm $(HTML_FILES) 2>/dev/null
-	-rm _output/* 2>/dev/null
-	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/WARNINGS
+	-rm -r _output 2>/dev/null
+	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/WARNINGS) 2>/dev/null
 	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/$(dir).emergency) 2>/dev/null