From 9e2196e3dc569ab97627acaa9ae32e3750617874 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Fri, 21 Apr 2006 08:25:45 +0000
Subject: [PATCH] on/off-line status entfernt aus Makefiles

---
 Makefile           |  3 ---
 documents/Makefile | 23 ++---------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index e1aaa37..086ccfb 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,6 @@ ERZEUGE_ISO = mkisofs -quiet $(ISO_OPTS) -o $(EXPORT_FILE).iso $(CCD_BUILD_DIR)
 ISO_OPTS = -iso-level 3 -J -joliet-long -relaxed-filenames -f -r -V $(EXPORT_PREFIX)$(REVISIONS_SUFFIX)
 # Ausgabe-Filter zum Einruecken
 EINRUECKEN = sed 's/^/\t/'
-# Voreinstellung - wird nur fuer "make website" ueberschrieben
-LINE_STATUS = offline
 
 ######### Variablen vererben ###########
 export CCD_BUILD_DIR
@@ -103,7 +101,6 @@ kopiere_programme:	cd-template
 	
 
 ####### die Ausgabe-Formate ###########
-website: LINE_STATUS=online
 website: EXPORT_FILE_SUFFIX := _website
 website: doku kopiere_programme
 	@echo "Gruppen-Schreibrecht setzen (fuer eduforge) ..."
diff --git a/documents/Makefile b/documents/Makefile
index 08cf20c..b990a0c 100644
--- a/documents/Makefile
+++ b/documents/Makefile
@@ -4,12 +4,10 @@ LYX_FILES := $(shell find -name *.lyx)
 TEX_FILES := $(patsubst %.lyx,%.tex,$(LYX_FILES))
 # output files of lyx that are already processed by mod_html_files.py
 HTML_FILES := $(patsubst %.lyx,%.html,$(LYX_FILES))
-# menue and footers are added (according to online/offline target)
+# menue and footers are added later
 TARGET_FILES := $(foreach file,$(LYX_FILES),_output/$(basename $(notdir $(file))).html)
 # menue and footer files
 ASC_FILES := $(wildcard *.asc)
-# target: online or offline (will be overriden for online target automatically)
-LINE_STATUS = offline
 # look for lyx executable
 LYX_BIN = $(shell which lyx lyx-qt lyx-xform | head -1)
 
@@ -20,7 +18,7 @@ LATEX2HTMLPREFIX := -no_auto_link -split 0 -no_navigation -no_subdir -dir _outpu
 
 # virtual targets that have different names than the produced files - they will alway be executed,
 # if another target depends on them (they do not look for timestamps)
-.PHONY : clean online offline clean-targets install all
+.PHONY : clean clean-targets install all
 
 # default target (offline)
 all: $(TARGET_FILES)
@@ -42,22 +40,6 @@ clean-targets:
 	-rm $(TARGET_FILES) 2>/dev/null
 
 
-online:	 LINE_STATUS=online
-offline: LINE_STATUS=offline
-
-# pruefen, ob die Menue-Datei durch eine neuere ersetzt werden muss - ansonsten: ignorieren
-menue.inc online offline: menue_$(LINE_STATUS).inc
-	@if diff -qN menue.inc menue_$(LINE_STATUS).inc >/dev/null ;\
-		then	true ;\
-		else	cp menue_$(LINE_STATUS).inc menue.inc ;\
-			make $@ ;\
-	  fi
-# "make $@" is necessary, as the dependency of HTML_FILES was checked, before
-# menue.inc was updated 
-
-online offline: $(TARGET_FILES)
-
-
 # add headers, navigation and footers
 $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES)
 	cat $(shell find -name $(notdir $@) | grep -v "_output") footer.asc >$@
@@ -88,5 +70,4 @@ clean:
 #	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/menue.inc) 2>/dev/null
 #	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/WARNINGS) 2>/dev/null
 #	-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/$(dir).emergency) 2>/dev/null
-	-rm menue.inc