From 3b4d2b63c67b66db436528c7935d3282872b59f1 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 16 Nov 2019 21:06:34 +1100 Subject: [PATCH] Remove references to ncurses in Makefile --- src/Makefile | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/Makefile b/src/Makefile index 590978ef..659b865a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -44,10 +44,7 @@ sources := $(sort $(wildcard *.cc)) objects := $(addprefix ., $(sources:.cc=$(suffix).o)) deps := $(addprefix ., $(sources:.cc=$(suffix).d)) -PKG_CONFIG ?= $(shell command -v pkg-config 2>/dev/null) - ifeq ($(static),yes) - PKG_CONFIG_FLAGS += --static LDFLAGS += -static -pthread endif @@ -63,35 +60,24 @@ mandir := $(DESTDIR)$(PREFIX)/share/man/man1 os := $(shell uname) ifeq ($(os),Darwin) - LIBS += -lncurses - NCURSES_CFLAGS += -I$(PREFIX)/opt/ncurses/include CPPFLAGS += -I/opt/local/include - LDFLAGS += -L$(PREFIX)/opt/ncurses/lib -L/opt/local/lib + LDFLAGS += -L/opt/local/lib else ifeq ($(os),FreeBSD) - LIBS += -ltinfow -lncursesw CPPFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib else ifeq ($(os),Haiku) - LIBS += -lncursesw -lnetwork -lbe + LIBS += -lnetwork -lbe else ifeq ($(os),OpenBSD) - LIBS += -lncursesw CPPFLAGS += -D'KAK_BIN_PATH="$(bindir)/kak"' -I/usr/local/include LDFLAGS += -L/usr/local/lib mandir := $(DESTDIR)$(PREFIX)/man/man1 else ifneq (,$(findstring _NT,$(os))) # Both Cygwin and MSYS2 have "_NT" in their uname. CPPFLAGS += -D_XOPEN_SOURCE=700 - LIBS += -lncursesw -ldbghelp + LIBS += -ldbghelp else ifeq ($(os),SunOS) - LIBS += -lncursesw LDFLAGS += -lsocket -rdynamic else - ifeq ($(PKG_CONFIG),) - $(error "pkg-config not found in PATH") - endif - - LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs ncursesw) - NCURSES_CFLAGS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags ncursesw) LDFLAGS += -rdynamic endif @@ -117,8 +103,6 @@ kak$(suffix) : $(objects) .version.o .%$(suffix).o: %.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $< -.ncurses_ui$(suffix).o: CPPFLAGS += $(NCURSES_CFLAGS) - .version.o: .version.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<