xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to ncurses in Makefile

Browse Source
This commit is contained in:
Maxime Coste 2019-11-16 21:06:34 +11:00
parent c12699d2e9
commit 3b4d2b63c6
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile
View File

@ -44,10 +44,7 @@ sources := $(sort $(wildcard *.cc))
objects := $(addprefix ., $(sources:.cc=$(suffix).o)) objects := $(addprefix ., $(sources:.cc=$(suffix).o))
deps := $(addprefix ., $(sources:.cc=$(suffix).d)) deps := $(addprefix ., $(sources:.cc=$(suffix).d))
PKG_CONFIG ?= $(shell command -v pkg-config 2>/dev/null)
ifeq ($(static),yes) ifeq ($(static),yes)
PKG_CONFIG_FLAGS += --static
LDFLAGS += -static -pthread LDFLAGS += -static -pthread
endif endif
@ -63,35 +60,24 @@ mandir := $(DESTDIR)$(PREFIX)/share/man/man1
os := $(shell uname) os := $(shell uname)
ifeq ($(os),Darwin) ifeq ($(os),Darwin)
LIBS += -lncurses
NCURSES_CFLAGS += -I$(PREFIX)/opt/ncurses/include
CPPFLAGS += -I/opt/local/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) else ifeq ($(os),FreeBSD)
LIBS += -ltinfow -lncursesw
CPPFLAGS += -I/usr/local/include CPPFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib LDFLAGS += -L/usr/local/lib
else ifeq ($(os),Haiku) else ifeq ($(os),Haiku)
LIBS += -lncursesw -lnetwork -lbe LIBS += -lnetwork -lbe
else ifeq ($(os),OpenBSD) else ifeq ($(os),OpenBSD)
LIBS += -lncursesw
CPPFLAGS += -D'KAK_BIN_PATH="$(bindir)/kak"' -I/usr/local/include CPPFLAGS += -D'KAK_BIN_PATH="$(bindir)/kak"' -I/usr/local/include
LDFLAGS += -L/usr/local/lib LDFLAGS += -L/usr/local/lib
mandir := $(DESTDIR)$(PREFIX)/man/man1 mandir := $(DESTDIR)$(PREFIX)/man/man1
else ifneq (,$(findstring _NT,$(os))) else ifneq (,$(findstring _NT,$(os)))
# Both Cygwin and MSYS2 have "_NT" in their uname. # Both Cygwin and MSYS2 have "_NT" in their uname.
CPPFLAGS += -D_XOPEN_SOURCE=700 CPPFLAGS += -D_XOPEN_SOURCE=700
LIBS += -lncursesw -ldbghelp LIBS += -ldbghelp
else ifeq ($(os),SunOS) else ifeq ($(os),SunOS)
LIBS += -lncursesw
LDFLAGS += -lsocket -rdynamic LDFLAGS += -lsocket -rdynamic
else 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 LDFLAGS += -rdynamic
endif endif
@ -117,8 +103,6 @@ kak$(suffix) : $(objects) .version.o
.%$(suffix).o: %.cc .%$(suffix).o: %.cc
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $<
.ncurses_ui$(suffix).o: CPPFLAGS += $(NCURSES_CFLAGS)
.version.o: .version.cc .version.o: .version.cc
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<