build-sys: move public header files into a dir of their own

Makefile.am

@@ -100,7 +100,8 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
-	-I $(top_srcdir)/src/journal
+	-I $(top_srcdir)/src/journal \
+	-I $(top_srcdir)/src/systemd
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -1053,7 +1054,7 @@ libsystemd_daemon_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
-	src/sd-daemon.h
+	src/systemd/sd-daemon.h
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
@@ -1131,7 +1132,7 @@ noinst_PROGRAMS += \
 	test-id128
 
 pkginclude_HEADERS += \
-	src/sd-id128.h
+	src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
 	libsystemd-id128.la
@@ -1290,8 +1291,8 @@ noinst_PROGRAMS += \
 	test-journal
 
 pkginclude_HEADERS += \
-	src/journal/sd-journal.h \
+	src/systemd/sd-journal.h \
-        src/journal/sd-messages.h
+        src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -1451,7 +1452,7 @@ nodist_systemunit_DATA += \
 	units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-	src/readahead/sd-readahead.h \
+	src/systemd/sd-readahead.h \
 	src/readahead/readahead-common.h \
 	units/systemd-readahead-collect.service.in \
 	units/systemd-readahead-replay.service.in \
@@ -1878,7 +1879,7 @@ dist_pkgsysconf_DATA += \
 	src/login/systemd-logind.conf
 
 pkginclude_HEADERS += \
-	src/login/sd-login.h
+	src/systemd/sd-login.h
 
 lib_LTLIBRARIES += \
 	libsystemd-login.la

src/initctl.c

@@ -34,13 +34,13 @@
 #include <ctype.h>
 
 #include <dbus/dbus.h>
+#include <systemd/sd-daemon.h>
 
 #include "util.h"
 #include "log.h"
 #include "list.h"
 #include "initreq.h"
 #include "special.h"
-#include "sd-daemon.h"
 #include "dbus-common.h"
 #include "def.h"
 

src/journal/journal-def.h

@@ -24,8 +24,9 @@
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "macro.h"
-#include "sd-id128.h"
 
 typedef struct Header Header;
 typedef struct ObjectHeader ObjectHeader;

src/journal/journal-file.h

@@ -24,9 +24,10 @@
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "journal-def.h"
 #include "util.h"
-#include "sd-id128.h"
 
 typedef struct Window {
         void *ptr;

src/journal/journal-internal.h

@@ -26,8 +26,9 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include <systemd/sd-id128.h>
+
 #include "list.h"
-#include "sd-id128.h"
 
 typedef struct Match Match;
 

src/journal/journalctl.c

@@ -30,7 +30,8 @@
 #include <time.h>
 #include <getopt.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "log.h"
 #include "util.h"
 #include "build.h"

src/journal/journald.c

@@ -32,19 +32,20 @@
 #include <linux/sockios.h>
 #include <sys/statvfs.h>
 
+#include <systemd/sd-journal.h>
+#include <systemd/sd-login.h>
+#include <systemd/sd-messages.h>
+#include <systemd/sd-daemon.h>
+
 #include "hashmap.h"
 #include "journal-file.h"
-#include "sd-daemon.h"
 #include "socket-util.h"
 #include "acl-util.h"
 #include "cgroup-util.h"
 #include "list.h"
 #include "journal-rate-limit.h"
-#include "sd-journal.h"
-#include "sd-login.h"
 #include "journal-internal.h"
 #include "conf-parser.h"
-#include "sd-messages.h"
 #include "journald.h"
 
 #define USER_JOURNALS_MAX 1024

src/journal/test-journal.c

@@ -22,7 +22,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "journal-file.h"
 #include "log.h"
 

src/kmsg-syslogd.c

@@ -33,9 +33,10 @@
 #include <fcntl.h>
 #include <sys/signalfd.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
 #include "fdset.h"
 
 #define SERVER_FD_MAX 16

src/login/logind.c

@@ -29,8 +29,9 @@
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "logind.h"
-#include "sd-daemon.h"
 #include "dbus-common.h"
 #include "dbus-loop.h"
 #include "strv.h"

src/login/pam-module.c

@@ -32,9 +32,10 @@
 #include <security/pam_ext.h>
 #include <security/pam_misc.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "macro.h"
-#include "sd-daemon.h"
 #include "strv.h"
 #include "dbus-common.h"
 #include "def.h"

src/login/test-login.c

@@ -22,7 +22,8 @@
 #include <sys/poll.h>
 #include <string.h>
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
+
 #include "util.h"
 #include "strv.h"
 

src/login/uaccess.c

@@ -22,11 +22,12 @@
 #include <errno.h>
 #include <string.h>
 
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-login.h>
+
 #include "logind-acl.h"
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
-#include "sd-login.h"
 
 int main(int argc, char *argv[]) {
         int r;

src/logs-show.h

@@ -24,7 +24,8 @@
 
 #include <stdbool.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "util.h"
 
 typedef enum OutputMode {

src/machine-id-setup.c

@@ -27,11 +27,12 @@
 #include <fcntl.h>
 #include <sys/mount.h>
 
+#include <systemd/sd-id128.h>
+
 #include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"
-#include "sd-id128.h"
 
 static int generate(char id[34]) {
         int fd, r;

src/manager.c

@@ -41,6 +41,8 @@
 #include <libaudit.h>
 #endif
 
+#include <systemd/sd-daemon.h>
+
 #include "manager.h"
 #include "hashmap.h"
 #include "macro.h"
@@ -58,7 +60,6 @@
 #include "special.h"
 #include "bus-errors.h"
 #include "exit-status.h"
-#include "sd-daemon.h"
 #include "virt.h"
 
 /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */

src/notify.c

@@ -27,10 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "strv.h"
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
 #include "sd-readahead.h"
 
 static bool arg_ready = false;

src/nspawn.c

@@ -39,11 +39,12 @@
 #include <grp.h>
 #include <linux/fs.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "log.h"
 #include "util.h"
 #include "missing.h"
 #include "cgroup-util.h"
-#include "sd-daemon.h"
 #include "strv.h"
 #include "loopback-setup.h"
 

src/readahead/readahead-collect.c

@@ -43,10 +43,11 @@
 #include <getopt.h>
 #include <sys/inotify.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "missing.h"
 #include "util.h"
 #include "set.h"
-#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"

src/readahead/readahead-replay.c

@@ -35,10 +35,11 @@
 #include <getopt.h>
 #include <sys/inotify.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "missing.h"
 #include "util.h"
 #include "set.h"
-#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"

src/sd-id128.c

@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "sd-id128.h"
+
 #include "util.h"
 #include "macro.h"
 

src/shutdownd.c

@@ -29,11 +29,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "shutdownd.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
-#include "sd-daemon.h"
 #include "utmp-wtmp.h"
 
 static int read_packet(int fd, struct shutdownd_command *_c) {

src/stdout-syslog-bridge.c

@@ -32,10 +32,11 @@
 #include <sys/un.h>
 #include <fcntl.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "util.h"
 #include "log.h"
 #include "list.h"
-#include "sd-daemon.h"
 #include "tcpwrap.h"
 #include "def.h"
 

src/systemctl.c

@@ -35,6 +35,8 @@
 #include <sys/prctl.h>
 #include <dbus/dbus.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "log.h"
 #include "util.h"
 #include "macro.h"
@@ -49,7 +51,6 @@
 #include "list.h"
 #include "path-lookup.h"
 #include "conf-parser.h"
-#include "sd-daemon.h"
 #include "shutdownd.h"
 #include "exit-status.h"
 #include "bus-errors.h"

src/test-daemon.c

@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 int main(int argc, char*argv[]) {
 

src/test-id128.c

@@ -21,7 +21,8 @@
 
 #include <string.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
+
 #include "util.h"
 #include "macro.h"