From d9de8059d4c9684b5c901840dccbd092121dd3e5 Mon Sep 17 00:00:00 2001 From: Simon K <Oct4v14n@googlemail.com> Date: Mon, 15 Mar 2021 12:20:23 +0100 Subject: [PATCH] Change g++ parameter order fixes ld errors on my machine (ubuntu 20.04) --- src/Makefile | 2 +- tools/list_keyrings.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index a651889..5ee5a07 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,5 +6,5 @@ EXTRA_FLAGS ?= secret: mkdir -p ../bin/ - $(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) unlock_keyrings.cc -o ../bin/unlock_keyrings + $(CXX) unlock_keyrings.cc -o ../bin/unlock_keyrings $(CXXFLAGS) $(EXTRA_FLAGS) diff --git a/tools/list_keyrings.sh b/tools/list_keyrings.sh index bb206f4..b40a2e9 100755 --- a/tools/list_keyrings.sh +++ b/tools/list_keyrings.sh @@ -1,4 +1,5 @@ #!/bin/bash -eval g++ $(pkg-config --cflags --libs gnome-keyring-1) list_keyrings.cc -o list.out && +cd $(dirname $0) +eval g++ list_keyrings.cc -o list.out -Wno-deprecated-declarations $(pkg-config --cflags --libs gnome-keyring-1) && ./list.out -- GitLab