make, scripts, tmpl/tex/de_presentation: Merged changes from V_1_2_0_35_NEUHAUS

make/defs.mk

@@ -103,6 +103,8 @@ ifeq ($(DEVELOPMENT),true)
   ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)
 	-include $(TOPDIR)/make/cfg_dev.mk
   endif
+  export G_SLICE=always-malloc
+  export G_DEBUG=gc-friendly,resident-modules
 else
   -include $(MODDIR)/make/defs-dist.mk
   ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),)

make/dirs.mk

@@ -39,7 +39,16 @@ dirs-%.done:
 	touch $@
 
 ifeq ($(DEVELOPMENT),true)
-dirs-all.done: $(wildcard $(BUILD_HDRDIR)) $(PREREQ_DIRS_DONE)
+
+dirs-all.done: $(wildcard $(BUILD_HDRDIR))
+
+ifeq ($(MAKECMDGOALS),all)
+dirs-all.done: $(PREREQ_DIRS_DONE)
+endif
+ifeq ($(MAKECMDGOALS),install)
+dirs-all.done: $(PREREQ_DIRS_DONE)
+endif
+
 dirs-install.done: dirs-all.done
 endif
 

make/run.mk

@@ -21,16 +21,15 @@ include $(MODDIR)/make/debugger.mk
 
 EXE_PATH ?= ./$(EXE)
 
+ifneq ($(wildcard local.supp),)
+VALGRIND_OPTS      += --suppressions=local.supp
+endif
+
 all:
 install:
-valgrind:
-	rm -f $(CORE)
-	valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
-	
-callgrind:
-	rm -f $(CORE)
-	valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
-	
+clean:
+distclean:
+
 ifeq ($(TARGET),mingw)
 run test: all
 	@echo "wine $(EXE_PATH) $(EXE_ARGS)"
@@ -46,6 +45,7 @@ clean: winrunclean
 
 winrunclean:
 	rm -f start.bat
+
 else
 run test: all
 	rm -f $(CORE)
@@ -54,6 +54,8 @@ start: all
 	rm -f $(CORE)
 	$(EXE_PATH) $(EXE_ARGS) &
 
+clean: vg-clean-supp
+
 # unfortunately iwatch only supports one directory :-(
 autorun:
 	make run &
@@ -65,6 +67,27 @@ wait-stop:
 
 restart: stop wait-stop all start
 
+valgrind:
+	rm -f $(CORE)
+	valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
+	
+supp.tmp:
+	valgrind  --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0
+
+vg-create-supp: supp.tmp
+	cat $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
+	rm -f supp.tmp
+
+vg-add-supp:
+	cat | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp
+
+vg-clean-supp:
+	rm -f local.supp
+
+callgrind:
+	rm -f $(CORE)
+	valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
+	
 endif
 
 stop:

make/tex.mk

@@ -10,6 +10,8 @@ ifeq ($(TEX_TMPL_DIR), "")
 	TEX_TMPL_DIR = thisisnotadirectory
 endif
 latex = latex
+PDFLATEX = pdflatex
+PDF_VIEWER = $(firstword $(shell which okular kpdf acroread))
 
 # this is what is there already
 PRE_FIG_LOCAL = $(wildcard *.fig)
@@ -32,6 +34,7 @@ GENERATED_HTML = $(filter %.html,$(GENERATED))
 
 CMD_PARSE_GRAPHICS = sed '/includegraphics/ !d; s/[^{]*{\([^}]*\).*/\1/; /^\.\./ d; s/^.\///' *.tex *.tmpl | sort -u
 
+CONTACT_EMAIL ?= contact@jannet.de
 ifeq ($(DIST_VERSION),)
 DIST_VERSION      = $(VERSION)
 endif
@@ -92,9 +95,10 @@ define mangle_tmpl
 	@echo "+ generating $< -> $@"
 	@if [ $(suffix $@) = tex ];  then echo -e $(TEX_WARN_DONT_EDIT)  > $@; fi
 	@if [ $(suffix $@) = html ]; then echo -e $(HTML_WARN_DONT_EDIT) > $@; fi
-	@cat $< | sed -e "\
+	cat $< | sed -e "\
 		s%__DATE__%$(DATE)%g; \
 		s%__AUTHORS__%$(AUTHORS)%g; \
+		s%__CONTACT_EMAIL__%$(CONTACT_EMAIL)%g; \
 		s%__TITLE__%$(TITLE)%g; \
 		s%__VERSION__%$(DIST_VERSION)%g; \
 		s%__SUBTITLE__%$(SUBTITLE)%g; \
@@ -111,13 +115,13 @@ define mangle_tmpl
 		s%__DOCUMENT_CLASS__%$(DOCUMENT_CLASS)%g; \
 		s%__UPLOAD_MODULE_PATH__%$(UPLOAD_MODULE_PATH)%g; \
 		s%__UPLOAD_TEST_PREFIX__%$(UPLOAD_TEST_PREFIX)%g; \
-		s%ä%\\\\\"a%g; \
-		s%Ä%\\\\\"A%g; \
-		s%ö%\\\\\"o%g; \
-		s%Ö%\\\\\"O%g; \
-		s%ü%\\\\\"u%g; \
-		s%Ü%\\\\\"U%g; \
-		s%ß%\\\"s%g; \
+		s%ä%\\\\\"a%g; \
+		s%Ä%\\\\\"A%g; \
+		s%ö%\\\\\"o%g; \
+		s%Ö%\\\\\"O%g; \
+		s%ü%\\\\\"u%g; \
+		s%Ü%\\\\\"U%g; \
+		s%ß%\\\"s%g; \
 		s%\xc3\xa4%\\\\\"a%g; \
 		s%\xc3\x84%\\\\\"A%g; \
 		s%\xc3\xb6%\\\\\"o%g; \
@@ -226,8 +230,8 @@ xdvi: $(LATEX_INPUT)
 
 xpdf: $(LATEX_INPUT)
 	@echo "-- running latex just once ..."
-	pdflatex $(MAIN).tex
-	kpdf $(MAIN).pdf
+	$(PDFLATEX) $(MAIN).tex
+	$(PDF_VIEWER) $(MAIN).pdf
 
 $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
 	@echo "-- creating zipfile with tex source files"
@@ -281,7 +285,7 @@ $(OUT).html.zip: $(HTMLDIR)
 
 $(OUTPUT).pdf: $(GENERATED)
 	@echo "-- creating pdf file"
-	@for i in 1 2 3 ; do echo "================================================================== pass $$i: running pdflatex $(MAIN).tex"; pdflatex $(MAIN).tex || exit 1;  done
+	@for i in 1 2 3 ; do echo "================================================================== pass $$i: running $(PDFLATEX) $(MAIN).tex"; $(PDFLATEX) $(MAIN).tex || exit 1;  done
 	@mv $(MAIN).pdf $(OUTPUT).pdf
 
 $(OUT).pdf.zip: $(OUTPUT).pdf
@@ -302,7 +306,7 @@ html_install: $(HTMLDIR)
 
 clean:
 	@echo "-- cleaning up ..."
-	rm -rf *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done *.rep \
+	rm -rf *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done *.rep *.nav *.snm \
 		*.4ct *.4tc *.4of *.4oo *.4os *.4og */*.4og *.css *.html *.idv *.lg *.xref *.odt \
 		*.lol *.bak *.idx *.ilg *.ind *.out *.brf .\#* \#* \
 		$(NEWDIRS) $(OUTPUT).txt \
@@ -316,7 +320,7 @@ priceclean: clean
 	done
 
 view: pdf
-	kpdf *.pdf
+	$(PDF_VIEWER) *.pdf
 
 unzip:
 	unzip *.zip