Merge branch 'release-1.1' into missy for 1.1.0 v1.1.0

1 files changed, 6 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 212ff00..2ec3a80 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # - Usage of += for appending to a variable
 
 PACKAGE = Badwolf
-VERSION = 1.0.3
+VERSION = 1.1.0
 VERSION_FULL = $(VERSION)`./version.sh`
 
 PREFIX  ?= /usr/local
@@ -15,7 +15,7 @@ DATADIR ?= $(PREFIX)/share/badwolf
 APPSDIR ?= $(PREFIX)/share/applications
 
 CC        ?= cc
-CFLAGS    ?= -g -Wall -Wextra -Wconversion -Wsign-conversion -O2
+CFLAGS    ?= -g -O2 -pie -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wconversion -Wsign-conversion -O2 -Werror=implicit-function-declaration -Werror=implicit-int -Werror=vla
 DBG       ?=
 PKGCONFIG ?= pkg-config
 MSGFMT    ?= msgfmt
@@ -24,13 +24,13 @@ INKSCAPE  ?= inkscape
 # for i in 24 32 48 64 128 256; do echo icons/hicolor/${i}x${i}/apps/badwolf.png; done | tr '\n' ' '
 ICON_SIZES = icons/hicolor/24x24/apps/badwolf.png icons/hicolor/32x32/apps/badwolf.png icons/hicolor/48x48/apps/badwolf.png icons/hicolor/64x64/apps/badwolf.png icons/hicolor/128x128/apps/badwolf.png icons/hicolor/256x256/apps/badwolf.png
 
-DEPS  = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4
-SRCS  = uri.c uri_test.c keybindings.c downloads.c badwolf.c
-OBJS  = uri.o keybindings.o downloads.o badwolf.o
+DEPS  = gtk+-3.0 webkit2gtk-4.0 libsoup-2.4 libxml-2.0
+SRCS  = bookmarks.c uri.c uri_test.c keybindings.c downloads.c badwolf.c
+OBJS  = bookmarks.o uri.o keybindings.o downloads.o badwolf.o
 OBJS_test = uri_test.o
 EXE   = badwolf
 EXE_test = uri_test
-TRANS = fr.mo pt_BR.mo tr.mo
+TRANS = fr.mo pt_BR.mo tr.mo de.mo
 DOCS  = usr.bin.badwolf README.md KnowledgeBase.md interface.txt
 
 CDEPS = -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION_FULL)\"