| | 1 | diff -u -r ../newsboat-2.11/Makefile ./Makefile |
| | 2 | --- ../newsboat-2.11/Makefile 2018-03-25 21:36:30.000000000 +0200 |
| | 3 | +++ ./Makefile 2018-03-30 22:52:36.721339528 +0200 |
| | 4 | @@ -9,6 +9,7 @@ |
| | 5 | |
| | 6 | # compiler |
| | 7 | CXX?=c++ |
| | 8 | +CXX_host?=c++ |
| | 9 | |
| | 10 | # compiler and linker flags |
| | 11 | DEFINES=-DLOCALEDIR=\"$(localedir)\" |
| | 12 | @@ -20,7 +21,7 @@ |
| | 13 | |
| | 14 | WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code |
| | 15 | INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss |
| | 16 | -BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) |
| | 17 | +BARE_CXXFLAGS=-std=c++11 -O2 $(INCLUDES) |
| | 18 | LDFLAGS+=-L. |
| | 19 | |
| | 20 | PACKAGE=newsboat |
| | 21 | @@ -34,7 +35,7 @@ |
| | 22 | LDFLAGS+=-fprofile-arcs -ftest-coverage |
| | 23 | endif |
| | 24 | |
| | 25 | -CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) |
| | 26 | +CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS) |
| | 27 | |
| | 28 | LIB_SOURCES:=$(shell cat mk/libboat.deps) |
| | 29 | LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES)) |
| | 30 | @@ -47,7 +48,7 @@ |
| | 31 | NEWSBOAT=newsboat |
| | 32 | NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps) |
| | 33 | NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES)) |
| | 34 | -NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp |
| | 35 | +NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob |
| | 36 | |
| | 37 | RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp)) |
| | 38 | RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES)) |
| | 39 | @@ -57,7 +58,7 @@ |
| | 40 | PODBOAT=podboat |
| | 41 | PODBOAT_SOURCES:=$(shell cat mk/podboat.deps) |
| | 42 | PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES)) |
| | 43 | -PODBOAT_LIBS=-lboat -lpthread |
| | 44 | +PODBOAT_LIBS=-lboat |
| | 45 | |
| | 46 | ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s))) |
| | 47 | NEWSBOAT_LIBS+=-liconv -lintl |
| | 48 | @@ -168,13 +169,13 @@ |
| | 49 | echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css |
| | 50 | |
| | 51 | doc/generate: doc/generate.cpp doc/split.h |
| | 52 | - $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp |
| | 53 | + $(CXX_host) -o doc/generate doc/generate.cpp |
| | 54 | |
| | 55 | doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv |
| | 56 | doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt |
| | 57 | |
| | 58 | doc/generate2: doc/generate2.cpp |
| | 59 | - $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp |
| | 60 | + $(CXX_host) -o doc/generate2 doc/generate2.cpp |
| | 61 | |
| | 62 | doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv |
| | 63 | doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt |
| | 64 | @@ -192,7 +193,7 @@ |
| | 65 | $(A2X) -f manpage doc/manpage-podboat.txt |
| | 66 | |
| | 67 | doc/gen-example-config: doc/gen-example-config.cpp doc/split.h |
| | 68 | - $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp |
| | 69 | + $(CXX_host) -o doc/gen-example-config doc/gen-example-config.cpp |
| | 70 | |
| | 71 | doc/example-config: doc/gen-example-config doc/configcommands.dsv |
| | 72 | cat doc/configcommands.dsv | doc/gen-example-config > doc/example-config |
~mdw / termux-packages / blame_incremental