46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff -u -r ../newsboat-2.15/Makefile ./Makefile
|
|
--- ../newsboat-2.15/Makefile 2019-03-23 16:51:04.000000000 +0000
|
|
+++ ./Makefile 2019-03-29 23:20:51.088253113 +0000
|
|
@@ -23,7 +23,7 @@
|
|
|
|
WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
|
|
INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
|
|
-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES)
|
|
+BARE_CXXFLAGS=-std=c++11 -O2 $(INCLUDES)
|
|
LDFLAGS+=-L.
|
|
|
|
PACKAGE=newsboat
|
|
@@ -37,7 +37,7 @@
|
|
LDFLAGS+=-fprofile-arcs -ftest-coverage
|
|
endif
|
|
|
|
-CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS)
|
|
+CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS)
|
|
CXXFLAGS_FOR_BUILD?=$(CXXFLAGS)
|
|
|
|
LIB_SOURCES:=$(shell cat mk/libboat.deps)
|
|
@@ -51,7 +51,7 @@
|
|
NEWSBOAT=newsboat
|
|
NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
|
|
NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
|
|
-NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp
|
|
+NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob
|
|
|
|
RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
|
|
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
|
|
@@ -76,12 +76,12 @@
|
|
endif
|
|
CARGO_FLAGS+=--release
|
|
endif
|
|
-LDFLAGS+=-lnewsboat -lpthread -ldl
|
|
+LDFLAGS+=-lnewsboat
|
|
|
|
PODBOAT=podboat
|
|
PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
|
|
PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
|
|
-PODBOAT_LIBS=-lboat -lpthread
|
|
+PODBOAT_LIBS=-lboat
|
|
|
|
ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
|
|
NEWSBOAT_LIBS+=-liconv -lintl
|