revert Makefile changes due to broken site
This commit is contained in:
vv01f
parent
945a01b188
commit
ceeb8a3f0f
|
|
@ -17,8 +17,12 @@ D := $(foreach e,$(E),$(subst $(e),,$(subst tpl/,,$(wildcard tpl/*.html))))
|
|||
# list of files to build including foreign langs
|
||||
L = $(D) $(E)
|
||||
|
||||
# function for counting chars
|
||||
countchars := $()
|
||||
|
||||
.PHONY: all
|
||||
all: $(L)
|
||||
@echo "built all html targets \t\t\t[DONE]"
|
||||
|
||||
install: all
|
||||
@echo "Nothing to install, built the site with 'make all' \
|
||||
|
|
@ -28,12 +32,12 @@ install: all
|
|||
|
||||
#eng: $(E)
|
||||
|
||||
$(D): % : tpl/% tpl/$(HD) tpl/$(ND) tpl/$(FD)
|
||||
$(D): %:tpl/% tpl/$(HD) tpl/$(ND) tpl/$(FD)
|
||||
@echo -n "Target: $(subst tpl/,,$<) \t\t\t"
|
||||
@cat tpl/$(HD) tpl/$(ND) $< tpl/$(FD) > $@
|
||||
@echo "[DONE]"
|
||||
|
||||
$(E): % : tpl/% tpl/$(HE) tpl/$(NE) tpl/$(FE)
|
||||
$(E): %:tpl/% tpl/$(HE) tpl/$(NE) tpl/$(FE)
|
||||
@echo -n "Target: $(subst tpl/,,$<) \t\t\t"
|
||||
@cat tpl/$(HE) tpl/$(NE) $< tpl/$(FE) > $@
|
||||
@echo "[DONE]"
|
||||
|
|
@ -41,12 +45,14 @@ $(E): % : tpl/% tpl/$(HE) tpl/$(NE) tpl/$(FE)
|
|||
print: $(L)
|
||||
@echo "Target 'all' checks for: $?"
|
||||
|
||||
# paths for deleting tmp files
|
||||
P = $(V) .
|
||||
# clean target
|
||||
#.PHONY: clean
|
||||
clean:
|
||||
@echo "Deleting tmp files (*.html and tpm as of vim)"
|
||||
@echo "ignore errors due to missing files ..."
|
||||
@rm *.html ||:
|
||||
@find ./ -name *.un~ -type f | xargs rm ||:
|
||||
$(foreach i,$(wildcard *.html),$(shell rm $(i) ))
|
||||
$(foreach i,$(foreach dir,$(P),$(wildcard $(dir)/.*.un~)),$(shell rm $(i) ))
|
||||
|
||||
|
||||
help:
|
||||
@echo Makefile for Datenspuren 2014 in c3d2-web
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ Dazu folgendes Schema für die ID und die Dateinamen der Vortragsbeschreibungen:
|
|||
|
||||
### Speaker:
|
||||
|
||||
* Quer-Verlinkung in Fahrplan beachten
|
||||
* Quer-Verlinkung in Programm beachten
|
||||
* Kontaktdaten überprüfen, z.B. PGP-Schlüssel bereitstellen falls gewünscht
|
||||
* Personenbezogene Daten schohnen - wenn nicht explizit anders gewünscht
|
||||
* Personenbezogene Daten schohnen
|
||||
* Vortragsfolien-Verlinkung (ggf. auskommentiert) vorbereiten
|
||||
|
||||
### Dokumente / Dateien
|
||||
|
|
@ -48,7 +48,12 @@ Dazu folgendes Schema für die ID und die Dateinamen der Vortragsbeschreibungen:
|
|||
* Benennung der Dateien wie die Beschreibungstexte der Vorträge beginnen
|
||||
* Freie Formate erzwingen, im Zweifel vor Veröffentlichung konvertieren
|
||||
* Lizenzen (im Verzeichnis *docs*) verlinken und benennen sofern von den Urhebern genannt,
|
||||
<<<<<<< HEAD
|
||||
* Standard:
|
||||
- CC-BY-SA für Videos / Vorträge / Doku / Kunst
|
||||
- GPL-V3 bei Code
|
||||
=======
|
||||
* Standard: CC-BY-SA für Vorträge / Doku / Kunst, GPL-V3 bei Code
|
||||
>>>>>>> parent of f3330a4... docu
|
||||
* Dokumente von externe Links ggf. spiegeln
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
<!doctype html>
|
||||
<html lang="de-de">
|
||||
<head>
|
||||
<title>Datenspuren 2014 - überwacht und zugenäht, reboot the nets - 11. Symposium Datenspuren</title>
|
||||
<meta charset="utf-8">
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="content-type">
|
||||
<meta content="Symposium Datenspuren - Rebuild the Nets, 2014, Kulturzentrum Scheune, veranstaltet vom Chaos Computer Club Dresden" name="description">
|
||||
<meta content="Symposium Datenspuren,c3d2,Chaos Computer Club,CCC,Dresden,Datenschutz,Privatsphäre,IPv6,Cloud,ePostbrief,de-Mail,Anonymität,informationelle Selbstbestimmung,Überwachung,Data Mining,ETSI,RFID,Mautsystem,Remailer,TCPA,TCG,Bundestrojaner,Vorratsdatenspeicherung,Biometrie,BigData,Freifunk,NSA,Own Infrastructure" name="keywords">
|
||||
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
|
||||
<meta content="index,follow" name="robots">
|
||||
<meta content="German" name="language">
|
||||
<link type="image/ico" href="img/favicon.ico" rel="icon">
|
||||
<link rel="stylesheet" type="text/css" href="css/fonts.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/screen.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/all.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/mob.css">
|
||||
</head>
|
||||
<body id="top"><div>
|
||||
<nav>
|
||||
<ul>
|
||||
<a href="portal.html" class="sec noborder"><li><!--⨻--><span title="11. Symposium Datenspuren">11DS</span></li></a>
|
||||
<!-- <a href="cfp.html" target="" class="sec redborder"><li>CfP</li></a>-->
|
||||
<a href="backing.html" class="sec redborder"><li>Support</li></a>
|
||||
<a href="cfp.html" class="sec redborder"><li>CfP</li></a>
|
||||
</ul>
|
||||
</nav>
|
||||
<!doctype html>
|
||||
<html lang="de-de">
|
||||
<head>
|
||||
<title>Datenspuren 2014 - überwacht und zugenäht, reboot the nets - 11. Symposium Datenspuren</title>
|
||||
<meta charset="utf-8">
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="content-type">
|
||||
<meta content="Symposium Datenspuren - Rebuild the Nets, 2014, Kulturzentrum Scheune, veranstaltet vom Chaos Computer Club Dresden" name="description">
|
||||
<meta content="Symposium Datenspuren,c3d2,Chaos Computer Club,CCC,Dresden,Datenschutz,Privatsphäre,IPv6,Cloud,ePostbrief,de-Mail,Anonymität,informationelle Selbstbestimmung,Überwachung,Data Mining,ETSI,RFID,Mautsystem,Remailer,TCPA,TCG,Bundestrojaner,Vorratsdatenspeicherung,Biometrie,BigData,Freifunk,NSA,Own Infrastructure" name="keywords">
|
||||
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
|
||||
<meta content="index,follow" name="robots">
|
||||
<meta content="German" name="language">
|
||||
<link type="image/ico" href="img/favicon.ico" rel="icon">
|
||||
<link rel="stylesheet" type="text/css" href="css/fonts.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/screen.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/all.css">
|
||||
<link rel="stylesheet" type="text/css" href="css/mob.css">
|
||||
</head>
|
||||
<body id="top"><div>
|
||||
<nav>
|
||||
<ul>
|
||||
<a href="portal.html" class="sec noborder"><li><!--⨻--><span title="11. Symposium Datenspuren">11DS</span></li></a>
|
||||
<!-- <a href="cfp.html" target="" class="sec redborder"><li>CfP</li></a>-->
|
||||
<a href="backing.html" class="sec redborder"><li>Support</li></a>
|
||||
<a href="cfp.html" class="sec redborder"><li>CfP</li></a>
|
||||
</ul>
|
||||
</nav>
|
||||
<!doctype html>
|
||||
<html lang="de-de">
|
||||
<head>
|
||||
<title>Datenspuren 2014 - überwacht und zugenäht, reboot the nets - 11. Symposium Datenspuren</title>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html>
|
||||
<!doctype html>
|
||||
<html lang="de-de">
|
||||
<head>
|
||||
<title>Datenspuren 2014 - überwacht und zugenäht, reboot the nets - 11. Symposium Datenspuren</title>
|
||||
|
|
|
|||
Loading…
Reference in New Issue