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
10 # compiler and linker flags
11 DEFINES=-DLOCALEDIR=\"$(localedir)\"
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)
22 LDFLAGS+=-fprofile-arcs -ftest-coverage
25 -CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS)
26 +CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS)
28 LIB_SOURCES:=$(shell cat mk/libboat.deps)
29 LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES))
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
37 RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
38 RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
41 PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
42 PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
43 -PODBOAT_LIBS=-lboat -lpthread
46 ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
47 NEWSBOAT_LIBS+=-liconv -lintl
49 echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css
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
55 doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv
56 doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt
58 doc/generate2: doc/generate2.cpp
59 - $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp
60 + $(CXX_host) -o doc/generate2 doc/generate2.cpp
62 doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv
63 doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt
65 $(A2X) -f manpage doc/manpage-podboat.txt
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
71 doc/example-config: doc/gen-example-config doc/configcommands.dsv
72 cat doc/configcommands.dsv | doc/gen-example-config > doc/example-config