42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
diff -u -r ../newsboat-2.10.1/Makefile ./Makefile
|
|
--- ../newsboat-2.10.1/Makefile 2017-09-22 22:01:50.000000000 +0200
|
|
+++ ./Makefile 2017-10-15 00:21:33.616133145 +0200
|
|
@@ -21,7 +21,7 @@
|
|
WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
|
|
INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
|
|
BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES)
|
|
-CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES)
|
|
+CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CPPFLAGS) -Wno-error=sign-compare -Wno-error=unused-lambda-capture
|
|
LDFLAGS+=-L. -fprofile-arcs -ftest-coverage
|
|
|
|
PACKAGE=newsboat
|
|
@@ -45,7 +45,7 @@
|
|
NEWSBEUTER=newsboat
|
|
NEWSBEUTER_SOURCES:=$(shell cat mk/newsbeuter.deps)
|
|
NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES))
|
|
-NEWSBEUTER_LIBS=-lbeuter -lfilter -lpthread -lrsspp
|
|
+NEWSBEUTER_LIBS=-lbeuter -lfilter -lrsspp -landroid-glob
|
|
|
|
RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
|
|
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
|
|
@@ -55,7 +55,7 @@
|
|
PODBEUTER=podboat
|
|
PODBEUTER_SOURCES:=$(shell cat mk/podbeuter.deps)
|
|
PODBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(PODBEUTER_SOURCES))
|
|
-PODBEUTER_LIBS=-lbeuter -lpthread
|
|
+PODBEUTER_LIBS=-lbeuter
|
|
|
|
ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
|
|
NEWSBEUTER_LIBS+=-liconv -lintl
|
|
@@ -67,8 +67,8 @@
|
|
INSTALL=install
|
|
A2X=a2x
|
|
MSGFMT=msgfmt
|
|
-RANLIB=ranlib
|
|
-AR=ar
|
|
+RANLIB?=ranlib
|
|
+AR?=ar
|
|
CHMOD=chmod
|
|
|
|
STFLHDRS:=$(patsubst %.stfl,%.h,$(wildcard stfl/*.stfl))
|