From 7a90c9a7118474962d4a336962690149bef585ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Mon, 9 May 2016 11:37:26 +0200
Subject: Improve Cygwin support

---
 util/Makefile  | 16 ++--------------
 util/README.md |  4 +---
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'util')

diff --git a/util/Makefile b/util/Makefile
index cec7b21..2c8161f 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,23 +1,11 @@
 -include ../../config.mk
 
-DEPS_ROOT = ../../dependency/install
-DEPS_PREFIX = $(DEPS_ROOT)/usr
-DEPS_LIB = $(DEPS_PREFIX)/lib
-DEPS_INC = $(DEPS_PREFIX)/include
-
-CFLAGS_TERMKEY ?= $(shell pkg-config --cflags termkey || echo "-I/usr/local/include")
-LDFLAGS_TERMKEY ?= $(shell pkg-config --libs termkey || echo "-ltermkey")
-
 keys: keys.c
 	@echo Compiling keys utility
-	$(CC) $(CFLAGS_TERMKEY) keys.c $(LDFLAGS_TERMKEY) -o keys
-
-keys-local: keys.c
-	@echo Compiling keys utility locally
-	$(CC) -I$(DEPS_INC) keys.c -L$(DEPS_LIB) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) -o keys
+	$(CC) $(CFLAGS) $(CFLAGS_TERMKEY) keys.c $(LDFLAGS) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) -o keys
 
 clean:
 	@echo cleaning
 	@rm -f keys
 
-.PHONY: clean keys-local
+.PHONY: clean
diff --git a/util/README.md b/util/README.md
index 3425336..5f2369a 100644
--- a/util/README.md
+++ b/util/README.md
@@ -6,6 +6,4 @@ by [libtermkey](http://www.leonerd.org.uk/code/libtermkey/) and also used
 to specify key bindings within vis, to their corresponding codes understood
 by terminal programs.
 
-Type `make` to build the utility. `make keys-local` links the utility against
-a locally built version of libtermkey as produced by the top level `make local`
-Makefile target.
+Type `make` to build the utility.
-- 
cgit v1.2.3