| 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-11-03 23:23:52.980621011 +0100 |
| 4 | @@ -21,8 +21,8 @@ |
| 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 | -LDFLAGS+=-L. -fprofile-arcs -ftest-coverage |
| 10 | +CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CPPFLAGS) -Wno-error=sign-compare -Wno-error=unused-lambda-capture |
| 11 | +LDFLAGS+=-L. |
| 12 | |
| 13 | PACKAGE=newsboat |
| 14 | |
| 15 | @@ -45,7 +45,7 @@ |
| 16 | NEWSBEUTER=newsboat |
| 17 | NEWSBEUTER_SOURCES:=$(shell cat mk/newsbeuter.deps) |
| 18 | NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES)) |
| 19 | -NEWSBEUTER_LIBS=-lbeuter -lfilter -lpthread -lrsspp |
| 20 | +NEWSBEUTER_LIBS=-lbeuter -lfilter -lrsspp -landroid-glob |
| 21 | |
| 22 | RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp)) |
| 23 | RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES)) |
| 24 | @@ -55,7 +55,7 @@ |
| 25 | PODBEUTER=podboat |
| 26 | PODBEUTER_SOURCES:=$(shell cat mk/podbeuter.deps) |
| 27 | PODBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(PODBEUTER_SOURCES)) |
| 28 | -PODBEUTER_LIBS=-lbeuter -lpthread |
| 29 | +PODBEUTER_LIBS=-lbeuter |
| 30 | |
| 31 | ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s))) |
| 32 | NEWSBEUTER_LIBS+=-liconv -lintl |
| 33 | @@ -67,8 +67,8 @@ |
| 34 | INSTALL=install |
| 35 | A2X=a2x |
| 36 | MSGFMT=msgfmt |
| 37 | -RANLIB=ranlib |
| 38 | -AR=ar |
| 39 | +RANLIB?=ranlib |
| 40 | +AR?=ar |
| 41 | CHMOD=chmod |
| 42 | |
| 43 | STFLHDRS:=$(patsubst %.stfl,%.h,$(wildcard stfl/*.stfl)) |