Merge branch 'vbatts/master'

Conflicts:
	thing.rb
This commit is contained in:
James Bowes 2012-08-01 06:53:38 -03:00
commit f4777de387

View file

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