Merge branch 'vbatts/master'

Conflicts:
	thing.rb

Makefile

@@ -1,4 +1,19 @@
-CFLAGS=`pkg-config --libs --cflags zlib`
 
-unpack: unpack.c
+CFLAGS += $(shell pkg-config --libs --cflags zlib)
-	gcc -Wall $(CFLAGS) -o unpack unpack.c
+CFLAGS += -Wall
+
+ifndef CC
+CC = gcc
+endif
+
+APP = unpack
+TMP_FILES = $(wildcard *~)
+
+all: $(APP)
+
+%: %.c
+	$(CC) $(CFLAGS) -o $@ $<
+
+clean:
+	rm -rf $(APP) $(TMP_FILES)
+