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

diff --git a/Makefile.am b/Makefile.am
index e668c09dd1a79871345ebf2cfc000f664f7b00f3..0c8804f481ee43c822439db24cb8cea6ebf51127 100644 (file)
--- a/Makefile.am
+++ b/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/journal/sd-messages.h
+       src/systemd/sd-journal.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

diff --git a/src/initctl.c b/src/initctl.c
index 097c85fdd4c8c897a8912c95954c2a89d7d97ded..e2189e9ee171e8ccf0f997f823badff2c55d5116 100644 (file)
--- a/src/initctl.c
+++ b/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"
 

diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index ef0cb6dae662bd530a357bea09382e454242ee12..964e0c2b81b6c58e5a970dcc359b0f9389c1fa13 100644 (file)
--- a/src/journal/journal-def.h
+++ b/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;

diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 51d7119d09fc534256d8a00372fa1dd71baed0cd..0be39329219fdef2b0a2aca5def7504c8cd02148 100644 (file)
--- a/src/journal/journal-file.h
+++ b/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;

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 1b64666da3e7c47c3e7be61c1200f8fe3acfb422..e5914bfb6399c1a090efb923d4a22601fc8b4af8 100644 (file)
--- a/src/journal/journal-internal.h
+++ b/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;
 

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 17d6a7fc2355d53f244dadf4ee2180cbce30fb39..2e708e959be1d8e73e2e545b16c61984bb6af2eb 100644 (file)
--- a/src/journal/journalctl.c
+++ b/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"

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d6206a802f2222e4313488bfe6b7d9745c420ed7..d7f0ed52b4ac742ac10c52560e105c2feba905f1 100644 (file)
--- a/src/journal/journald.c
+++ b/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

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 3d429bea9051bbdbbad4f539bbcd7db8525c503a..a023509b703e491e61e75313a01ee9155f5e6431 100644 (file)
--- a/src/journal/test-journal.c
+++ b/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"
 

diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c
index f42f72c2adaafefe3242ee7d71ee89dec49844e7..da83bb2b1eb14d597e62542ee580fd6145f323fa 100644 (file)
--- a/src/kmsg-syslogd.c
+++ b/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

diff --git a/src/login/logind.c b/src/login/logind.c
index 99534a52eddabc9b8b2483b09704b71d6039aabf..4aeac0cc2e28a7b6e88acdd828f4acb40e925a67 100644 (file)
--- a/src/login/logind.c
+++ b/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"

diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index 14e706b37430a52c2f03953f48fc36a159d2793e..82594c30d5f543773804df22de4738ec0e324b9a 100644 (file)
--- a/src/login/pam-module.c
+++ b/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"

diff --git a/src/login/test-login.c b/src/login/test-login.c
index 7d6f08202d91821d2643adb618e2a7034e6e124a..ae041b6a59f70eca0db899749fb4a93943ab0533 100644 (file)
--- a/src/login/test-login.c
+++ b/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"
 

diff --git a/src/login/uaccess.c b/src/login/uaccess.c
index 49ac4af0f4c18c704c789bb060bc552590fbf99c..e1af5bf43165da6a2389bf827f056ec91c74a0f6 100644 (file)
--- a/src/login/uaccess.c
+++ b/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;

diff --git a/src/logs-show.h b/src/logs-show.h
index 5cf1a6369bf2cfb53f5c0f047fefaf1c870d68d6..d3f3c759603c6ce7ac557e27abedcc8a7aa76de5 100644 (file)
--- a/src/logs-show.h
+++ b/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 {

diff --git a/src/machine-id-setup.c b/src/machine-id-setup.c
index 9b25b10438b8702b8c239442a1c20bc414928396..531f3b207382b4709a3bc6db51f9a5dac8ce93d1 100644 (file)
--- a/src/machine-id-setup.c
+++ b/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;

diff --git a/src/manager.c b/src/manager.c
index 9957bbf12ac56d26b1a64315f4a739c1600e041e..7fd860ed06666db407eb06c42920d3eb5c287e2f 100644 (file)
--- a/src/manager.c
+++ b/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 */

diff --git a/src/notify.c b/src/notify.c
index a9bc51e2dbcfe0ca971d747a966a44d3e4482f1e..9d52bdfdd34606cc6dfcb3494387e147d0a4cddb 100644 (file)
--- a/src/notify.c
+++ b/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;

diff --git a/src/nspawn.c b/src/nspawn.c
index 3ea603f2352443e1bcceb05a783e74ac10a891f7..b8b379d9913d1fec63ff19ee53bf63a200119bbe 100644 (file)
--- a/src/nspawn.c
+++ b/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"
 

diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index eac11e7e5c160477f6c8ba61fd4d2394a67b6b97..6bff32f4dd0a1e8084f2b3af4c76faa6717fac18 100644 (file)
--- a/src/readahead/readahead-collect.c
+++ b/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"

diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
index 65011ac4be3996d0ff41f92f44e889fdf3cb289a..88c7a219a8dd5fa04e4ebd353d4818c2883943ea 100644 (file)
--- a/src/readahead/readahead-replay.c
+++ b/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"

diff --git a/src/sd-id128.c b/src/sd-id128.c
index 387cf919b02c7c7f217d1dacbb375e4bbc3ca210..289bcdc4ff89d5660ea13cb2d79238286daffad6 100644 (file)
--- a/src/sd-id128.c
+++ b/src/sd-id128.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "sd-id128.h"
+
 #include "util.h"
 #include "macro.h"
 

diff --git a/src/shutdownd.c b/src/shutdownd.c
index 46856b01ad616b8230f96193ce48ea26fc89bfd7..19b16cbe39e366ec4c5ca275a6174786db2147ad 100644 (file)
--- a/src/shutdownd.c
+++ b/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) {

diff --git a/src/stdout-syslog-bridge.c b/src/stdout-syslog-bridge.c
index 6ec23ec6120ae3c0db9fa458b3c830452d87cc64..e82716a1bdf1179dd03933698466fe27fd19d1da 100644 (file)
--- a/src/stdout-syslog-bridge.c
+++ b/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"
 

diff --git a/src/systemctl.c b/src/systemctl.c
index 2f03f6baa8a702e326ac7eb703773066557e94cd..9b915f65d6248b6723a6c45f3bc438b151f3f13d 100644 (file)
--- a/src/systemctl.c
+++ b/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"

diff --git a/src/sd-daemon.h b/src/systemd/sd-daemon.h
similarity index 100%
rename from src/sd-daemon.h
rename to src/systemd/sd-daemon.h

diff --git a/src/sd-id128.h b/src/systemd/sd-id128.h
similarity index 100%
rename from src/sd-id128.h
rename to src/systemd/sd-id128.h

diff --git a/src/journal/sd-journal.h b/src/systemd/sd-journal.h
similarity index 100%
rename from src/journal/sd-journal.h
rename to src/systemd/sd-journal.h

diff --git a/src/login/sd-login.h b/src/systemd/sd-login.h
similarity index 100%
rename from src/login/sd-login.h
rename to src/systemd/sd-login.h

diff --git a/src/readahead/sd-readahead.h b/src/systemd/sd-readahead.h
similarity index 100%
rename from src/readahead/sd-readahead.h
rename to src/systemd/sd-readahead.h

diff --git a/src/test-daemon.c b/src/test-daemon.c
index c7600d4d63dcb000432a886aad9286bbebf110a7..20c5d1517ea28c4402dd535b3f363a8a952e2fd1 100644 (file)
--- a/src/test-daemon.c
+++ b/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[]) {
 

diff --git a/src/test-id128.c b/src/test-id128.c
index d7c9d4326e75b057070c39bee4a0a552e5443811..617c95568bd78907b3a6bbd1b7d9467009fb4a5a 100644 (file)
--- a/src/test-id128.c
+++ b/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"