Skip to content

Commit

Permalink
Merge branch 'beatgammit-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob Gelbman committed Jan 25, 2015
2 parents cffe0d5 + cf2c7c3 commit d7d33da
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*.a
*.lo
*.o
*.so
usr/
*.sw?
/.deps
/.dirstamp
18 changes: 11 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CFLAGS = -g -Wall -I.
CFLAGS = -g -Wall -I. -fPIC
CC = gcc
PREFIX = /usr/local
PREFIX = $(DESTDIR)/usr/local
TESTS = $(patsubst %.c, %, $(wildcard t/*.c))

ifdef ANSI
Expand All @@ -21,27 +21,31 @@ endif
%.so:
$(CC) -shared $(LDFLAGS) $(TARGET_ARCH) $(filter %.o, $^) $(LDLIBS) -o $@

all: libtap.a tests
all: libtap.a libtap.so tests

libtap.a: tap.o

libtap.so: tap.o

tap.o: tap.c tap.h

tests: $(TESTS)

$(TESTS): %: %.o libtap.a
$(TESTS): %: %.o libtap.so

$(patsubst %, %.o, $(TESTS)): %.o: %.c tap.h

clean:
rm -rf *.o t/*.o libtap.a $(TESTS)
rm -rf *.o t/*.o libtap.a libtap.so $(TESTS)

install: libtap.a tap.h
install: libtap.a tap.h libtap.so
mkdir -p $(PREFIX)/lib $(PREFIX)/include
install -c libtap.a $(PREFIX)/lib
install -c libtap.so $(PREFIX)/lib
install -c tap.h $(PREFIX)/include

uninstall:
rm $(PREFIX)/lib/libtap.a $(PREFIX)/include/tap.h
rm $(PREFIX)/lib/libtap.a $(PREFIX)/lib/libtap.so $(PREFIX)/include/tap.h

dist:
rm libtap.zip
Expand Down

0 comments on commit d7d33da

Please sign in to comment.