journal: silence gcc warnings

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6629d91b96bf3a553882936cc96b626e5f777980..5255fcc4dae15784174e0cac96732a9fca1e039d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ lib_LTLIBRARIES = \
 
 pkginclude_HEADERS = \
        src/sd-daemon.h \
-       src/sd-login.h \
+       src/login/sd-login.h \
         src/sd-id128.h \
         src/journal/sd-journal.h
 
@@ -258,11 +258,11 @@ endif
 dist_pkgsysconf_DATA = \
        src/system.conf \
         src/user.conf \
-        src/systemd-logind.conf
+        src/login/systemd-logind.conf
 
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.login1.conf
+        src/login/org.freedesktop.login1.conf
 
 if ENABLE_HOSTNAMED
 dist_dbuspolicy_DATA += \
@@ -281,7 +281,7 @@ endif
 
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.login1.service
+        src/login/org.freedesktop.login1.service
 
 if ENABLE_HOSTNAMED
 dist_dbussystemservice_DATA += \
@@ -520,9 +520,9 @@ EXTRA_DIST = \
         libsystemd-id128.pc.in \
         libsystemd-journal.pc.in \
        src/libsystemd-daemon.sym \
-       src/libsystemd-login.sym \
+       src/login/libsystemd-login.sym \
        src/libsystemd-id128.sym \
-       src/libsystemd-journal.sym \
+       src/journal/libsystemd-journal.sym \
        introspect.awk \
        src/73-seat-late.rules.in \
         src/99-systemd.rules.in \
@@ -627,7 +627,7 @@ pkgconfiglib_DATA = \
 
 # Passed through intltool only
 polkitpolicy_in_files = \
-        src/org.freedesktop.login1.policy.in
+        src/login/org.freedesktop.login1.policy.in
 
 if ENABLE_HOSTNAMED
 polkitpolicy_in_files += \
@@ -792,12 +792,12 @@ EXTRA_DIST += \
         src/pager.h \
         src/sysfs-show.h \
         src/polkit.h \
-        src/logind.h \
-        src/logind-device.h \
-        src/logind-seat.h \
-        src/logind-session.h \
-        src/logind-user.h \
-        src/logind-acl.h \
+        src/login/logind.h \
+        src/login/logind-device.h \
+        src/login/logind-seat.h \
+        src/login/logind-session.h \
+        src/login/logind-user.h \
+        src/login/logind-acl.h \
         src/dbus-loop.h \
         src/spawn-agent.h \
         src/journal/journal-def.h \
@@ -1018,7 +1018,7 @@ test_strv_LDADD = \
        libsystemd-basic.la
 
 test_login_SOURCES = \
-       src/test-login.c
+       src/login/test-login.c
 
 test_login_CFLAGS = \
        $(AM_CFLAGS)
@@ -1230,25 +1230,25 @@ systemd_timedated_LDADD = \
        $(DBUS_LIBS)
 
 systemd_logind_SOURCES = \
-       src/logind.c \
-       src/logind-dbus.c \
-        src/logind-device.c \
-        src/logind-seat.c \
-        src/logind-seat-dbus.c \
-        src/logind-session.c \
-        src/logind-session-dbus.c \
-        src/logind-user.c \
-        src/logind-user-dbus.c \
+       src/login/logind.c \
+       src/login/logind-dbus.c \
+        src/login/logind-device.c \
+        src/login/logind-seat.c \
+        src/login/logind-seat-dbus.c \
+        src/login/logind-session.c \
+        src/login/logind-session-dbus.c \
+        src/login/logind-user.c \
+        src/login/logind-user-dbus.c \
         src/dbus-common.c \
         src/dbus-loop.c \
         src/cgroup-util.c \
         src/polkit.c
 
 nodist_systemd_logind_SOURCES = \
-        src/logind-gperf.c
+        src/login/logind-gperf.c
 
 EXTRA_DIST += \
-        src/logind-gperf.gperf
+        src/login/logind-gperf.gperf
 
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1264,15 +1264,15 @@ systemd_logind_LDADD = \
         $(ACL_LIBS)
 
 systemd_uaccess_SOURCES = \
-       src/uaccess.c
+       src/login/uaccess.c
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
-       src/logind-acl.c \
+       src/login/logind-acl.c \
         src/acl-util.c
 
 systemd_uaccess_SOURCES += \
-       src/logind-acl.c \
+       src/login/logind-acl.c \
         src/acl-util.c
 endif
 
@@ -1519,7 +1519,7 @@ systemctl_LDADD = \
        $(DBUS_LIBS)
 
 systemd_loginctl_SOURCES = \
-       src/loginctl.c \
+       src/login/loginctl.c \
        src/dbus-common.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
@@ -1720,7 +1720,7 @@ libsystemd-daemon-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
 libsystemd_login_la_SOURCES = \
-        src/sd-login.c \
+        src/login/sd-login.c \
         src/cgroup-util.c
 
 libsystemd_login_la_CFLAGS = \
@@ -1730,7 +1730,7 @@ libsystemd_login_la_CFLAGS = \
 libsystemd_login_la_LDFLAGS = \
         -shared \
         -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-        -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+        -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
        libsystemd-basic.la
@@ -1791,7 +1791,7 @@ libsystemd_journal_la_CFLAGS = \
 libsystemd_journal_la_LDFLAGS = \
         -shared \
         -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-        -Wl,--version-script=$(top_srcdir)/src/libsystemd-journal.sym
+        -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-basic.la \
@@ -1886,7 +1886,7 @@ CLEANFILES = \
         src/load-fragment-gperf.gperf \
         src/load-fragment-gperf.c \
         src/load-fragment-gperf-nulstr.c \
-        src/logind-gperf.c
+        src/login/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \