From dda0d5c763a83315f2907454b540f55d42cf0ace Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Fri, 8 May 2026 11:03:31 +0200
Subject: [PATCH] Relocate keventd from src/ to keventd/

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 Makefile.am                |  5 +++++
 configure.ac               |  1 +
 keventd/.gitignore         |  4 ++++
 keventd/Makefile.am        | 10 ++++++++++
 {src => keventd}/keventd.c |  0
 {src => keventd}/keventd.h |  0
 {src => keventd}/uevent.c  |  0
 src/Makefile.am            |  8 --------
 8 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 keventd/.gitignore
 create mode 100644 keventd/Makefile.am
 rename {src => keventd}/keventd.c (100%)
 rename {src => keventd}/keventd.h (100%)
 rename {src => keventd}/uevent.c (100%)

diff --git a/Makefile.am b/Makefile.am
index f5e82762..9123fc13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,11 @@ if DBUS
 SUBDIRS           += libink dbus-1
 endif
 SUBDIRS           += src system tmpfiles.d
+
+if KEVENTD
+SUBDIRS           += keventd
+endif
+
 dist_doc_DATA      = README.md LICENSE contrib/finit.conf
 
 if CONTRIB
diff --git a/configure.ac b/configure.ac
index 3e21a66e..6c8948c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ AC_CONFIG_FILES([Makefile
 	man/Makefile
 	plugins/Makefile
 	src/Makefile
+	keventd/Makefile
 	system/Makefile system/10-hotplug.conf
 	test/test.env test/Makefile
 	test/lib/Makefile test/src/Makefile
diff --git a/keventd/.gitignore b/keventd/.gitignore
new file mode 100644
index 00000000..138068ae
--- /dev/null
+++ b/keventd/.gitignore
@@ -0,0 +1,4 @@
+.deps/
+keventd
+Makefile
+Makefile.in
diff --git a/keventd/Makefile.am b/keventd/Makefile.am
new file mode 100644
index 00000000..52d0cfba
--- /dev/null
+++ b/keventd/Makefile.am
@@ -0,0 +1,10 @@
+AM_CPPFLAGS        = -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
+AM_CPPFLAGS       += -I$(top_srcdir)/src
+
+pkglibexec_PROGRAMS = keventd
+
+keventd_SOURCES    = keventd.c keventd.h uevent.c \
+		     $(top_srcdir)/src/util.c $(top_srcdir)/src/util.h
+keventd_CFLAGS     = -W -Wall -Wextra -std=gnu99
+keventd_CFLAGS    += $(lite_CFLAGS)
+keventd_LDADD      = $(lite_LIBS)
diff --git a/src/keventd.c b/keventd/keventd.c
similarity index 100%
rename from src/keventd.c
rename to keventd/keventd.c
diff --git a/src/keventd.h b/keventd/keventd.h
similarity index 100%
rename from src/keventd.h
rename to keventd/keventd.h
diff --git a/src/uevent.c b/keventd/uevent.c
similarity index 100%
rename from src/uevent.c
rename to keventd/uevent.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 81bd327a..b7c544f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,9 +13,6 @@ pkglibexec_PROGRAMS  = getty logit runparts tmpfiles
 if SULOGIN
 pkglibexec_PROGRAMS += sulogin
 endif
-if KEVENTD
-pkglibexec_PROGRAMS += keventd
-endif
 if WATCHDOGD
 pkglibexec_PROGRAMS += watchdogd
 endif
@@ -30,11 +27,6 @@ getty_CFLAGS         = -W -Wall -Wextra -std=gnu99
 getty_CFLAGS        += $(lite_CFLAGS)
 getty_LDADD          = $(lite_LIBS)
 
-keventd_SOURCES      = keventd.c keventd.h uevent.c util.c util.h
-keventd_CFLAGS       = -W -Wall -Wextra -std=gnu99
-keventd_CFLAGS      += $(lite_CFLAGS)
-keventd_LDADD        = $(lite_LIBS)
-
 runparts_SOURCES     = runparts.c
 runparts_CFLAGS      = -W -Wall -Wextra -std=gnu99
 runparts_CFLAGS     += $(lite_CFLAGS)