diff options
| -rw-r--r-- | bin/Makefile | 13 | ||||
| -rw-r--r-- | bin/worker.c | 4 | ||||
| -rw-r--r-- | bin/ykfde-cpio.c | 2 | ||||
| -rw-r--r-- | bin/ykfde.c | 4 | ||||
| -rw-r--r-- | config.def.h | 2 | ||||
| -rw-r--r-- | systemd/ykfde-2f.service | 2 | ||||
| -rw-r--r-- | systemd/ykfde-worker.service | 2 | ||||
| -rw-r--r-- | systemd/ykfde.service | 2 |
8 files changed, 18 insertions, 13 deletions
diff --git a/bin/Makefile b/bin/Makefile index 67d3066..e1c8ed2 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -4,17 +4,22 @@ INSTALL := install RM := rm # flags CFLAGS += -std=gnu11 -O2 -fPIC -Wall -Werror -CFLAGS_YUBIKEY += -liniparser -lkeyutils -lykpers-1 -lyubikey -CFLAGS_SYSTEMD += $(shell pkg-config --cflags --libs libsystemd 2>/dev/null) +CFLAGS_EXTRA += $(shell pkg-config --cflags --libs iniparser) +CFLAGS_EXTRA += $(shell pkg-config --cflags --libs libkeyutils) +CFLAGS_EXTRA += $(shell pkg-config --cflags --libs ykpers-1) -lyubikey +CFLAGS_SYSTEMD := $(shell pkg-config --cflags --libs libsystemd 2>/dev/null) +ifneq ($(CFLAGS_SYSTEMD),) +CFLAGS_EXTRA += -DHAVE_SYSTEMD $(CFLAGS_SYSTEMD) +endif LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie all: worker ykfde ykfde-cpio worker: worker.c ../config.h - $(CC) worker.c $(CFLAGS) $(CFLAGS_YUBIKEY) $(CFLAGS_SYSTEMD) $(LDFLAGS) -o worker + $(CC) worker.c $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o worker ykfde: ykfde.c ../config.h ../version.h - $(CC) ykfde.c $(CFLAGS) $(CFLAGS_YUBIKEY) $(CFLAGS_SYSTEMD) -lcryptsetup $(LDFLAGS) -o ykfde + $(CC) ykfde.c $(CFLAGS) $(CFLAGS_EXTRA) -lcryptsetup $(LDFLAGS) -o ykfde ykfde-cpio: ykfde-cpio.c ../config.h ../version.h $(CC) ykfde-cpio.c $(CFLAGS) -larchive $(LDFLAGS) -o ykfde-cpio diff --git a/bin/worker.c b/bin/worker.c index 114433c..a32ed09 100644 --- a/bin/worker.c +++ b/bin/worker.c @@ -1,5 +1,5 @@ /* - * (C) 2014-2023 by Christian Hesse <mail@eworm.de> + * (C) 2014-2025 by Christian Hesse <mail@eworm.de> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ #include <systemd/sd-daemon.h> -#include <iniparser.h> +#include <iniparser/iniparser.h> #include <keyutils.h> diff --git a/bin/ykfde-cpio.c b/bin/ykfde-cpio.c index 4b0ff94..8259d73 100644 --- a/bin/ykfde-cpio.c +++ b/bin/ykfde-cpio.c @@ -1,5 +1,5 @@ /* - * (C) 2014-2023 by Christian Hesse <mail@eworm.de> + * (C) 2014-2025 by Christian Hesse <mail@eworm.de> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/bin/ykfde.c b/bin/ykfde.c index 5657bfb..82401f5 100644 --- a/bin/ykfde.c +++ b/bin/ykfde.c @@ -1,5 +1,5 @@ /* - * (C) 2014-2023 by Christian Hesse <mail@eworm.de> + * (C) 2014-2025 by Christian Hesse <mail@eworm.de> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ #include <systemd/sd-daemon.h> -#include <iniparser.h> +#include <iniparser/iniparser.h> #include <keyutils.h> diff --git a/config.def.h b/config.def.h index 83f230e..e5fe664 100644 --- a/config.def.h +++ b/config.def.h @@ -1,5 +1,5 @@ /* - * (C) 2014-2023 by Christian Hesse <mail@eworm.de> + * (C) 2014-2025 by Christian Hesse <mail@eworm.de> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/systemd/ykfde-2f.service b/systemd/ykfde-2f.service index 5b551c4..bf9b6e3 100644 --- a/systemd/ykfde-2f.service +++ b/systemd/ykfde-2f.service @@ -1,4 +1,4 @@ -# (C) 2016-2023 by Christian Hesse <mail@eworm.de> +# (C) 2016-2025 by Christian Hesse <mail@eworm.de> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/systemd/ykfde-worker.service b/systemd/ykfde-worker.service index 47c89e1..bee2c20 100644 --- a/systemd/ykfde-worker.service +++ b/systemd/ykfde-worker.service @@ -1,4 +1,4 @@ -# (C) 2016-2023 by Christian Hesse <mail@eworm.de> +# (C) 2016-2025 by Christian Hesse <mail@eworm.de> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/systemd/ykfde.service b/systemd/ykfde.service index 899e698..768f0fd 100644 --- a/systemd/ykfde.service +++ b/systemd/ykfde.service @@ -1,4 +1,4 @@ -# (C) 2016-2023 by Christian Hesse <mail@eworm.de> +# (C) 2016-2025 by Christian Hesse <mail@eworm.de> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |