diff --git a/.gitignore b/.gitignore
index e10912a..63dcd6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,8 @@ Temporary Items
 
 *~
 .directory
-
+*.o
+*.so
 #
 # Visual Studio
 #
diff --git a/Makefile b/Makefile
index 327b48a..d2fb7a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
+PKG_CONFIG = pkg-config
+RM = rm
+LN = ln
+
 all: test
 
 clean:
-	rm -f test libgamepad.so libgamepad.so.1 gamepad.o
+	$(RM) -f test libgamepad.so libgamepad.so.1 gamepad.o
 
 gamepad.o: gamepad.c gamepad.h
 	$(CC) -c -fPIC -fvisibility=hidden -Wall -Werror -o $@ $< $(CCFLAGS)
@@ -10,11 +14,10 @@ libgamepad.so.1: gamepad.o gamepad.h
 	$(CC) -shared -Wl,-soname,libgamepad.so.1 -o $@ $< $(CCFLAGS) -lc -lm -ludev
 
 libgamepad.so: libgamepad.so.1
-	ln -sf libgamepad.so.1 libgamepad.so
+	$(LN) -sf libgamepad.so.1 libgamepad.so
 
 test: main.c libgamepad.so
-	$(CC) -o $@ $< -Wl,-rpath,. -L. -lgamepad -lcurses -ludev
-
+	$(CC) -o $@ $< -Wl,-rpath,. -L. -lgamepad `$(PKG_CONFIG) tinfo ncurses --cflags --libs` -ludev 
 install: libgamepad.so
 
 .PHONY: all clean install
diff --git a/main.c b/main.c
index e797cb8..24cffbe 100644
--- a/main.c
+++ b/main.c
@@ -34,7 +34,7 @@ static void logevent(const char* format, ...) {
 	clrtoeol();
 
 	va_start(va, format);
-	vwprintw(stdscr, format, va);
+	vw_printw(stdscr, format, va);
 	va_end(va);
 
 	if (++line == 14) {