diff --git a/Makefile b/Makefile index 270f8b3..7de421b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = umask 002; exec /bin/sh FILES = events.ics events.atom news.atom index.html stats.html \ favicon.ico default.css csclub.der csclub.pem -SUBDIRS = about events office news services media buttons logos flash +SUBDIRS = about events office news services media buttons logos flash library include common.mk diff --git a/common.mk.in b/common.mk.in index ec3d455..2fb6e4b 100644 --- a/common.mk.in +++ b/common.mk.in @@ -37,6 +37,10 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ +$(OUTDIR)%.cgi: %.cgi + cp -f $< $@ +$(OUTDIR).htaccess: + cp -f .htaccess $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css diff --git a/events.xml b/events.xml index 0e0ff2d..cafd3c5 100644 --- a/events.xml +++ b/events.xml @@ -59,16 +59,26 @@ and its guranteed to be dazzling. -

A brief intro to Quantum Computing and why it matters, - followed by a talk on programming quantum computers. + followed by a talk on programming quantum computers. Meet at + the CSC at 4:00PM for a guided walk to the RAC.

-

- TBA

 + +

+ Raymond Laflamme is the director of the Institute for Quantum + Computing at the University of Waterloo and holds the Canada + Research Chair in Quantum Information. He will give a brief + introduction to quantum computing and why it matters, followed + by a talk on programming quantum computers. There will be + tours of the IQC labs at the end, and pizza will be provided + back at the CSC for all attendees. +

+ diff --git a/library/Makefile b/library/Makefile new file mode 100644 index 0000000..18618b5 --- /dev/null +++ b/library/Makefile @@ -0,0 +1,6 @@ +FILES = index.cgi .htaccess +RELDIR = library/ +include ../common.mk + +.htaccess: .htaccess + cp -f $< $@ \ No newline at end of file diff --git a/menu.xml b/menu.xml index c7f476f..f9d1600 100644 --- a/menu.xml +++ b/menu.xml @@ -10,5 +10,5 @@ - +