From 13f072ac206a50e37fe5faba4cc7dec35f6b2af2 Mon Sep 17 00:00:00 2001 From: lars Date: Sun, 24 Apr 2005 13:06:48 +0000 Subject: [PATCH] Verweise auf "_bilder" korrigiert "_output" wird nun per Makefile erzeugt -> mehr Uebersicht bei "svn status" --- documents/Makefile | 12 ++++++------ documents/copyleft/copyleft.lyx | 2 +- documents/intro/intro.lyx | 2 +- documents/thunderbird/thunderbird.lyx | 6 +++--- .../thunderbirdnutzung/thunderbirdnutzung.lyx | 4 ++-- .../warumverschluesselung.lyx | 2 +- documents/winpt/winpt.lyx | 18 +++++++++--------- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/documents/Makefile b/documents/Makefile index 470ea75..294e855 100644 --- a/documents/Makefile +++ b/documents/Makefile @@ -1,5 +1,4 @@ -#DOCUMENT_NAMES=asymmetrie chaosradio copyleft intro mailserviceanbieter mozilla outlook pgp_vs_gnupg senselab thunderbird thunderbirdnutzung warumverschluesselung wiefunktionierts winpt -DOCUMENT_NAMES=asymmetrie chaosradio copyleft intro mailserviceanbieter mozilla outlook pgp_vs_gnupg senselab wiefunktionierts +DOCUMENT_NAMES=asymmetrie chaosradio copyleft intro mailserviceanbieter mozilla outlook pgp_vs_gnupg senselab thunderbird thunderbirdnutzung warumverschluesselung wiefunktionierts winpt LYX_FILES := $(foreach dir,$(DOCUMENT_NAMES),$(dir)/$(dir).lyx) TEX_FILES := $(patsubst %.lyx,%.tex,$(LYX_FILES)) @@ -8,11 +7,10 @@ TARGET_FILES := $(foreach dir,$(DOCUMENT_NAMES),_output/$(dir).html) ASC_FILES := $(wildcard *.asc) LINE_STATUS = offline -#LATEX2HTMLPREFIX := -no_auto_link -split 0 -init_file ../convert-scripts/latex2html-init -no_navigation -no_subdir LATEX2HTMLPREFIX := -no_auto_link -split 0 -no_navigation -no_subdir -dir _output -.PHONY : clean online offline clean-targets +.PHONY : clean online offline clean-targets create-dirs install # default target (offline) all: $(HTML_FILES) @@ -23,6 +21,9 @@ 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 @@ -38,9 +39,8 @@ $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES) $(TEX_FILES): %.tex: %.lyx lyx -e latex $*.lyx - # original html-files, as they are created by lyx -$(HTML_FILES): %.html: %.tex +$(HTML_FILES): create-dirs %.html: %.tex latex2html $(LATEX2HTMLPREFIX) $*.tex # die html-Datei wurde jetzt im _output-Verzeichnis erstellt (inklusive Bilder) -rm _output/WARNINGS $*-labels.pl $*-internals.pl 2>/dev/null diff --git a/documents/copyleft/copyleft.lyx b/documents/copyleft/copyleft.lyx index f3b5ee9..8088dc1 100644 --- a/documents/copyleft/copyleft.lyx +++ b/documents/copyleft/copyleft.lyx @@ -62,7 +62,7 @@ collapsed false \begin_inset Graphics - filename _bilder/somerights20.png + filename somerights20.png \end_inset diff --git a/documents/intro/intro.lyx b/documents/intro/intro.lyx index 564050e..1e8645e 100644 --- a/documents/intro/intro.lyx +++ b/documents/intro/intro.lyx @@ -56,7 +56,7 @@ collapsed false \begin_inset Graphics - filename _bilder/oldskool_klein.png + filename oldskool_klein.png \end_inset diff --git a/documents/thunderbird/thunderbird.lyx b/documents/thunderbird/thunderbird.lyx index 755aaa1..600894a 100644 --- a/documents/thunderbird/thunderbird.lyx +++ b/documents/thunderbird/thunderbird.lyx @@ -418,7 +418,7 @@ collapsed false \begin_inset Graphics - filename _bilder/enigmail_einstellungen01.png + filename enigmail_einstellungen01.png \end_inset @@ -489,7 +489,7 @@ collapsed false \begin_inset Graphics - filename _bilder/enigmail_einstellungen02.png + filename enigmail_einstellungen02.png \end_inset @@ -537,7 +537,7 @@ collapsed false \begin_inset Graphics - filename _bilder/enigmail01b.png + filename enigmail01b.png \end_inset diff --git a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx index 9310aee..4eb6d18 100644 --- a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx +++ b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx @@ -100,7 +100,7 @@ collapsed false \begin_inset Graphics - filename _bilder/enigmail02.png + filename enigmail02.png \end_inset @@ -182,7 +182,7 @@ collapsed false \begin_inset Graphics - filename _bilder/thunderbird.png + filename thunderbird.png \end_inset diff --git a/documents/warumverschluesselung/warumverschluesselung.lyx b/documents/warumverschluesselung/warumverschluesselung.lyx index b408998..1a214f9 100644 --- a/documents/warumverschluesselung/warumverschluesselung.lyx +++ b/documents/warumverschluesselung/warumverschluesselung.lyx @@ -181,7 +181,7 @@ collapsed false \begin_inset Graphics - filename _bilder/netzschema.png + filename netzschema.png \end_inset diff --git a/documents/winpt/winpt.lyx b/documents/winpt/winpt.lyx index f848198..cd00eff 100644 --- a/documents/winpt/winpt.lyx +++ b/documents/winpt/winpt.lyx @@ -165,7 +165,7 @@ collapsed false \begin_inset Graphics - filename _bilder/gnupt_install_02.png + filename gnupt_install_02.png \end_inset @@ -236,7 +236,7 @@ collapsed false \begin_inset Graphics - filename _bilder/gnupt_install_04.png + filename gnupt_install_04.png \end_inset @@ -289,7 +289,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_einrichten_01.png + filename winpt_einrichten_01.png \end_inset @@ -313,7 +313,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_einrichten_02.png + filename winpt_einrichten_02.png \end_inset @@ -341,7 +341,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_einrichten_03.1.png + filename winpt_einrichten_03.1.png \end_inset @@ -367,7 +367,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_einrichten_03.2.png + filename winpt_einrichten_03.2.png \end_inset @@ -523,7 +523,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_systray.png + filename winpt_systray.png \end_inset @@ -545,7 +545,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_import_01.png + filename winpt_import_01.png \end_inset @@ -595,7 +595,7 @@ collapsed false \begin_inset Graphics - filename _bilder/winpt_import_02.png + filename winpt_import_02.png \end_inset