Commit | Line | Data |
---|---|---|
1577e97f FF |
1 | diff -u -r ../newsboat-2.10.1/Makefile ./Makefile |
2 | --- ../newsboat-2.10.1/Makefile 2017-09-22 22:01:50.000000000 +0200 | |
3 | +++ ./Makefile 2017-10-15 00:21:33.616133145 +0200 | |
4 | @@ -21,7 +21,7 @@ | |
5 | WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code | |
6 | INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss | |
7 | BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES) | |
8 | -CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) | |
9 | +CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CPPFLAGS) -Wno-error=sign-compare -Wno-error=unused-lambda-capture | |
10 | LDFLAGS+=-L. -fprofile-arcs -ftest-coverage | |
11 | ||
12 | PACKAGE=newsboat | |
13 | @@ -45,7 +45,7 @@ | |
14 | NEWSBEUTER=newsboat | |
15 | NEWSBEUTER_SOURCES:=$(shell cat mk/newsbeuter.deps) | |
16 | NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES)) | |
17 | -NEWSBEUTER_LIBS=-lbeuter -lfilter -lpthread -lrsspp | |
18 | +NEWSBEUTER_LIBS=-lbeuter -lfilter -lrsspp -landroid-glob | |
19 | ||
20 | RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp)) | |
21 | RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES)) | |
22 | @@ -55,7 +55,7 @@ | |
23 | PODBEUTER=podboat | |
24 | PODBEUTER_SOURCES:=$(shell cat mk/podbeuter.deps) | |
25 | PODBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(PODBEUTER_SOURCES)) | |
26 | -PODBEUTER_LIBS=-lbeuter -lpthread | |
27 | +PODBEUTER_LIBS=-lbeuter | |
28 | ||
29 | ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s))) | |
30 | NEWSBEUTER_LIBS+=-liconv -lintl | |
31 | @@ -67,8 +67,8 @@ | |
32 | INSTALL=install | |
33 | A2X=a2x | |
34 | MSGFMT=msgfmt | |
35 | -RANLIB=ranlib | |
36 | -AR=ar | |
37 | +RANLIB?=ranlib | |
38 | +AR?=ar | |
39 | CHMOD=chmod | |
40 | ||
41 | STFLHDRS:=$(patsubst %.stfl,%.h,$(wildcard stfl/*.stfl)) |