chiark / gitweb /
build-sys: move public header files into a dir of their own
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Jan 2012 15:01:58 +0000 (16:01 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Jan 2012 15:01:58 +0000 (16:01 +0100)
31 files changed:
Makefile.am
src/initctl.c
src/journal/journal-def.h
src/journal/journal-file.h
src/journal/journal-internal.h
src/journal/journalctl.c
src/journal/journald.c
src/journal/test-journal.c
src/kmsg-syslogd.c
src/login/logind.c
src/login/pam-module.c
src/login/test-login.c
src/login/uaccess.c
src/logs-show.h
src/machine-id-setup.c
src/manager.c
src/notify.c
src/nspawn.c
src/readahead/readahead-collect.c
src/readahead/readahead-replay.c
src/sd-id128.c
src/shutdownd.c
src/stdout-syslog-bridge.c
src/systemctl.c
src/systemd/sd-daemon.h [moved from src/sd-daemon.h with 100% similarity]
src/systemd/sd-id128.h [moved from src/sd-id128.h with 100% similarity]
src/systemd/sd-journal.h [moved from src/journal/sd-journal.h with 100% similarity]
src/systemd/sd-login.h [moved from src/login/sd-login.h with 100% similarity]
src/systemd/sd-readahead.h [moved from src/readahead/sd-readahead.h with 100% similarity]
src/test-daemon.c
src/test-id128.c

index e668c09..0c8804f 100644 (file)
@@ -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
index 097c85f..e2189e9 100644 (file)
 #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"
 
index ef0cb6d..964e0c2 100644 (file)
@@ -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;
index 51d7119..0be3932 100644 (file)
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "journal-def.h"
 #include "util.h"
-#include "sd-id128.h"
 
 typedef struct Window {
         void *ptr;
index 1b64666..e5914bf 100644 (file)
@@ -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;
 
index 17d6a7f..2e708e9 100644 (file)
@@ -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"
index d6206a8..d7f0ed5 100644 (file)
 #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
index 3d429be..a023509 100644 (file)
@@ -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"
 
index f42f72c..da83bb2 100644 (file)
 #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
index 99534a5..4aeac0c 100644 (file)
@@ -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"
index 14e706b..82594c3 100644 (file)
 #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"
index 7d6f082..ae041b6 100644 (file)
@@ -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"
 
index 49ac4af..e1af5bf 100644 (file)
 #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;
index 5cf1a63..d3f3c75 100644 (file)
@@ -24,7 +24,8 @@
 
 #include <stdbool.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "util.h"
 
 typedef enum OutputMode {
index 9b25b10..531f3b2 100644 (file)
 #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;
index 9957bbf..7fd860e 100644 (file)
@@ -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 */
index a9bc51e..9d52bdf 100644 (file)
 #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;
index 3ea603f..b8b379d 100644 (file)
 #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"
 
index eac11e7..6bff32f 100644 (file)
 #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"
index 65011ac..88c7a21 100644 (file)
 #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"
index 387cf91..289bcdc 100644 (file)
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "sd-id128.h"
+
 #include "util.h"
 #include "macro.h"
 
index 46856b0..19b16cb 100644 (file)
 #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) {
index 6ec23ec..e82716a 100644 (file)
 #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"
 
index 2f03f6b..9b915f6 100644 (file)
@@ -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"
similarity index 100%
rename from src/sd-daemon.h
rename to src/systemd/sd-daemon.h
similarity index 100%
rename from src/sd-id128.h
rename to src/systemd/sd-id128.h
similarity index 100%
rename from src/login/sd-login.h
rename to src/systemd/sd-login.h
index c7600d4..20c5d15 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 int main(int argc, char*argv[]) {
 
index d7c9d43..617c955 100644 (file)
@@ -21,7 +21,8 @@
 
 #include <string.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
+
 #include "util.h"
 #include "macro.h"