diff --git a/Makefile b/Makefile index 3a6b506..a87e88b 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ books.xml: echo '' >> $@ events.ics: - perl xml2ics.pl events.xml > events.ics + perl scripts/xml2ics.pl events.xml > events.ics include default.mk diff --git a/clubs/index.xml b/clubs/index.xml index 868d472..57d7e5f 100644 --- a/clubs/index.xml +++ b/clubs/index.xml @@ -42,7 +42,7 @@
  • The Mathematics Society (MathSoc)
  • UW New Democratic Party Club
  • Ontario Sikh Students Association
    • -
  • Pure Math, Applied Math, and C&O Club
    • +
  • Pure Math, Applied Math, and C&O Club
  • UW Ski Club
  • UW Spanish Club
  • Student Programming Project
    • diff --git a/cow/.gitignore b/cow/.gitignore index 7651631..50fd5e2 100644 --- a/cow/.gitignore +++ b/cow/.gitignore @@ -1,2 +1,4 @@ *.o -/cow +/i686 +/x86_64 +/alpha diff --git a/cow/Makefile b/cow/Makefile index 4465291..8db51e4 100644 --- a/cow/Makefile +++ b/cow/Makefile @@ -1,10 +1,17 @@ -MAIN = cow +ARCH=$(shell uname -m) +MAIN = $(ARCH)/cow CFLAGS = -I/usr/include/libxml2 -DDEBUG -pedantic -ansi -Wall LDFLAGS = $(CFLAGS) -lxml2 -lxslt SOURCES = $(wildcard *.c) -OBJECTS = $(SOURCES:.c=.o) +OBJECTS = $(addprefix $(ARCH)/,$(SOURCES:.c=.o)) all: $(MAIN) +$(ARCH): + mkdir -p $(ARCH) + $(MAIN): $(OBJECTS) $(CC) $(LDFLAGS) -o $@ $(OBJECTS) + +$(ARCH)/%.o: %.c $(ARCH) + $(CC) -c $(CFLAGS) -o $@ $< diff --git a/cow/cow b/cow/cow new file mode 100755 index 0000000..2cfccc3 --- /dev/null +++ b/cow/cow @@ -0,0 +1,2 @@ +#!/bin/sh +exec "$(dirname $0)/$(uname -m)/$(basename $0)" "$@" diff --git a/media/index.xml b/media/index.xml index 0533129..5c0102c 100644 --- a/media/index.xml +++ b/media/index.xml @@ -11,7 +11,7 @@ CD or DVD should you so choose.