diff -u -r ../newsboat-2.14/Makefile ./Makefile --- ../newsboat-2.14/Makefile 2018-12-29 13:07:06.000000000 +0000 +++ ./Makefile 2018-12-31 02:05:43.501854145 +0000 @@ -9,6 +9,7 @@ # compiler CXX?=c++ +CXX_host?=c++ # compiler and linker flags DEFINES=-DLOCALEDIR=\"$(localedir)\" @@ -20,7 +21,7 @@ WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss -BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) +BARE_CXXFLAGS=-std=c++11 -O2 $(INCLUDES) LDFLAGS+=-L. PACKAGE=newsboat @@ -34,7 +35,7 @@ LDFLAGS+=-fprofile-arcs -ftest-coverage endif -CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) +CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS) LIB_SOURCES:=$(shell cat mk/libboat.deps) LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES)) @@ -47,7 +48,7 @@ NEWSBOAT=newsboat NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps) NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES)) -NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp +NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp)) RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES)) @@ -62,12 +63,12 @@ LDFLAGS+=-L.//target/release CARGO_FLAGS+=--release endif -LDFLAGS+=-lnewsboat -lpthread -ldl +LDFLAGS+=-lnewsboat PODBOAT=podboat PODBOAT_SOURCES:=$(shell cat mk/podboat.deps) PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES)) -PODBOAT_LIBS=-lboat -lpthread +PODBOAT_LIBS=-lboat ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s))) NEWSBOAT_LIBS+=-liconv -lintl @@ -186,13 +187,13 @@ echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css doc/generate: doc/generate.cpp doc/split.h - $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp + $(CXX_host) -o doc/generate doc/generate.cpp doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt doc/generate2: doc/generate2.cpp - $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp + $(CXX_host) -o doc/generate2 doc/generate2.cpp doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt @@ -210,7 +211,7 @@ $(A2X) -f manpage doc/manpage-podboat.txt doc/gen-example-config: doc/gen-example-config.cpp doc/split.h - $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp + $(CXX_host) -o doc/gen-example-config doc/gen-example-config.cpp doc/example-config: doc/gen-example-config doc/configcommands.dsv sed 's/+{backslash}"+/`\\"`/g' doc/configcommands.dsv | doc/gen-example-config > doc/example-config