Merge branch 'vbatts/master'
Conflicts: thing.rb
This commit is contained in:
commit
f4777de387
1 changed files with 18 additions and 3 deletions
21
Makefile
21
Makefile
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue