diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2016-05-09 11:37:26 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2016-05-09 11:45:16 +0200 |
| commit | 7a90c9a7118474962d4a336962690149bef585ac (patch) | |
| tree | 5788ee655080eead7e9e037a9c284d8b782e98f6 | |
| parent | 8d7f35be97b4d3c2508524032c5762b75f3a213b (diff) | |
| download | vis-7a90c9a7118474962d4a336962690149bef585ac.tar.gz vis-7a90c9a7118474962d4a336962690149bef585ac.tar.xz | |
Improve Cygwin support
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | core/.gitignore | 1 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | lua/Makefile | 4 | ||||
| -rw-r--r-- | util/Makefile | 16 | ||||
| -rw-r--r-- | util/README.md | 4 |
6 files changed, 8 insertions, 26 deletions
@@ -4,15 +4,10 @@ test: @$(MAKE) -C vis @$(MAKE) -C lua -test-local: keys-local test - -keys-local: - @$(MAKE) -C util $@ - clean: @$(MAKE) -C core clean @$(MAKE) -C vim clean @$(MAKE) -C vis clean @$(MAKE) -C lua clean -.PHONY: test test-local keys-local clean +.PHONY: test clean diff --git a/core/.gitignore b/core/.gitignore index 486e08a..6a145ff 100644 --- a/core/.gitignore +++ b/core/.gitignore @@ -3,3 +3,4 @@ /buffer /map /array +/ccan-config diff --git a/core/Makefile b/core/Makefile index cc5c5a5..3cf06ce 100644 --- a/core/Makefile +++ b/core/Makefile @@ -11,7 +11,7 @@ test: text buffer map array config.h: @echo Generating ccan configuration header - @${CC} ccan-config.c && ./a.out > config.h && rm -f a.out + @${CC} ccan-config.c -o ccan-config && ./ccan-config > config.h text: config.h text.c ../../text.c ../../text-util.c ../../text-motions.c ../../text-objects.c ../../text-regex.c @echo Compiling $@ binary diff --git a/lua/Makefile b/lua/Makefile index 3404c8b..faeb8fd 100644 --- a/lua/Makefile +++ b/lua/Makefile @@ -1,5 +1,3 @@ -.PHONY=all clean test - all: clean test clean: @@ -10,3 +8,5 @@ test: %: %.in @./test.sh $@ + +.PHONY: all clean test 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. |