split selinux label operations out of cgroup-util, socket-util

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2dfc9cf77bee4a8df3395e101acd61ee7f107d7..07b30ebd1e16ddba8447f1ffc92f770ca5bcedcc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -575,29 +575,30 @@ libsystemd_shared_la_SOURCES = \
        src/shared/pager.c \
        src/shared/pager.h \
        src/shared/ioprio.h \
+       src/shared/socket-util.c \
+       src/shared/socket-util.h \
+       src/shared/cgroup-util.c \
+       src/shared/cgroup-util.h \
        src/shared/list.h \
        src/shared/macro.h
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la
 
-libsystemd_shared_selinux_la_SOURCES = \
-       src/shared/cgroup-util.c \
-       src/shared/cgroup-util.h \
-       src/shared/socket-util.c \
-       src/shared/socket-util.h \
+libsystemd_label_la_SOURCES = \
+       src/shared/cgroup-label.c \
+       src/shared/socket-label.c \
        src/shared/label.c \
        src/shared/label.h \
        src/shared/mkdir.c \
        src/shared/mkdir.h
 
-libsystemd_shared_selinux_la_CFLAGS = \
+libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(SELINUX_CFLAGS)
 
-libsystemd_shared_selinux_la_LIBADD = \
-       libsystemd-shared.la \
+libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -785,8 +786,9 @@ libsystemd_core_la_CFLAGS = \
        $(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
-       libsystemd-shared-selinux.la \
        libsystemd-capability.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la \
        $(DBUS_LIBS) \
        $(LIBWRAP_LIBS) \
@@ -841,7 +843,7 @@ test_loopback_SOURCES = \
        src/loopback-setup.c
 
 test_loopback_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 test_hostname_SOURCES = \
        src/test-hostname.c \
@@ -861,7 +863,8 @@ test_cgroup_SOURCES = \
        src/test-cgroup.c
 
 test_cgroup_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 test_env_replace_SOURCES = \
        src/test-env-replace.c
@@ -887,7 +890,8 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 test_watchdog_SOURCES = \
        src/test-watchdog.c \
@@ -933,7 +937,8 @@ systemd_shutdownd_SOURCES = \
        src/shutdownd.c
 
 systemd_shutdownd_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la
 
 pkginclude_HEADERS += \
@@ -948,7 +953,8 @@ systemd_shutdown_SOURCES = \
        src/watchdog.h
 
 systemd_shutdown_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la
 
 # ------------------------------------------------------------------------------
@@ -968,7 +974,8 @@ systemd_tmpfiles_SOURCES = \
        src/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -976,7 +983,8 @@ systemd_machine_id_setup_SOURCES = \
        src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
@@ -1028,14 +1036,16 @@ systemd_getty_generator_SOURCES = \
        src/unit-name.c
 
 systemd_getty_generator_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_remount_api_vfs_SOURCES = \
@@ -1075,7 +1085,8 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-journal.la \
        libsystemd-id128.la \
@@ -1096,7 +1107,8 @@ systemd_ask_password_SOURCES = \
        src/ask-password-api.c
 
 systemd_ask_password_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_reply_password_SOURCES = \
@@ -1111,14 +1123,14 @@ systemd_cgls_SOURCES = \
        src/cgroup-show.c
 
 systemd_cgls_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_cgtop_SOURCES = \
        src/cgtop.c
 
 systemd_cgtop_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
@@ -1126,7 +1138,8 @@ systemd_nspawn_SOURCES = \
        src/loopback-setup.c
 
 systemd_nspawn_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-capability.la \
        libsystemd-daemon.la
 
@@ -1144,7 +1157,8 @@ systemd_tty_ask_password_agent_SOURCES = \
        src/utmp-wtmp.c
 
 systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
@@ -1156,6 +1170,7 @@ libsystemd_daemon_la_CFLAGS = \
        -DSD_EXPORT_SYMBOLS
 
 libsystemd_daemon_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
@@ -1384,7 +1399,7 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-daemon.la \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
@@ -1421,7 +1436,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
        libudev-core.la \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 TESTS = \
@@ -1611,6 +1626,7 @@ libgudev_1_0_la_LIBADD = \
        $(GLIB_LIBS)
 
 libgudev_1_0_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
        -export-dynamic -no-undefined \
        -export-symbols-regex '^g_udev_.*'
@@ -1850,6 +1866,7 @@ libsystemd_id128_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_id128_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
@@ -1861,7 +1878,7 @@ test_id128_SOURCES = \
        src/test-id128.c
 
 test_id128_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libsystemd-id128.la
 
 noinst_PROGRAMS += \
@@ -1902,11 +1919,18 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
        src/journal/journald.c \
+       src/journal/journald.h \
        src/journal/sd-journal.c \
        src/journal/journal-file.c \
+       src/journal/journal-file.h \
        src/journal/lookup3.c \
+       src/journal/lookup3.h \
        src/journal/journal-rate-limit.c \
-       src/journal/sparse-endian.h
+       src/journal/journal-rate-limit.h \
+       src/journal/sparse-endian.h \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/compress.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
@@ -1914,7 +1938,8 @@ nodist_systemd_journald_SOURCES = \
 systemd_journald_CFLAGS =
 
 systemd_journald_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-login.la \
@@ -1941,7 +1966,7 @@ systemd_cat_SOURCES = \
        src/journal/cat.c
 
 systemd_cat_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libsystemd-journal.la
 
 journalctl_SOURCES = \
@@ -1949,7 +1974,7 @@ journalctl_SOURCES = \
        src/logs-show.c
 
 journalctl_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libsystemd-journal.la \
        libsystemd-id128.la
 
@@ -1971,7 +1996,8 @@ test_journal_SOURCES = \
        src/journal/journal-send.c
 
 test_journal_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-id128.la
 
 if HAVE_XZ
@@ -1990,7 +2016,7 @@ test_journal_send_SOURCES = \
        src/journal/test-journal-send.c
 
 test_journal_send_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libsystemd-journal.la
 
 libsystemd_journal_la_SOURCES = \
@@ -2004,12 +2030,13 @@ libsystemd_journal_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_journal_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libsystemd-id128.la
 
 if HAVE_XZ
@@ -2090,13 +2117,6 @@ INSTALL_DATA_HOOKS += \
        journal-install-data-hook
 
 EXTRA_DIST += \
-       src/journal/journald.h \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/journal-file.h \
-       src/journal/lookup3.h \
-       src/journal/compress.h \
-       src/journal/journal-rate-limit.h \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
@@ -2113,7 +2133,8 @@ systemd_coredump_SOURCES = \
 systemd_coredump_LDADD = \
        libsystemd-journal.la \
        libsystemd-login.la \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-coredump
@@ -2202,7 +2223,8 @@ endif
 if ENABLE_READAHEAD
 systemd_readahead_collect_SOURCES = \
        src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
 
 systemd_readahead_collect_LDADD = \
        libsystemd-shared.la \
@@ -2218,6 +2240,9 @@ systemd_readahead_replay_LDADD = \
        libsystemd-daemon.la \
        libudev.la
 
+pkginclude_HEADERS += \
+       src/systemd/sd-readahead.h
+
 rootlibexec_PROGRAMS += \
        systemd-readahead-collect \
        systemd-readahead-replay
@@ -2231,8 +2256,6 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-       src/systemd/sd-readahead.h \
-       src/readahead/readahead-common.h \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in
@@ -2277,7 +2300,8 @@ systemd_random_seed_SOURCES = \
        src/random-seed.c
 
 systemd_random_seed_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 randomseed-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -2314,7 +2338,8 @@ systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -2323,7 +2348,8 @@ systemd_cryptsetup_generator_SOURCES = \
        src/unit-name.c
 
 systemd_cryptsetup_generator_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-label.la \
+       libsystemd-shared.la
 
 cryptsetup-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -2399,7 +2425,8 @@ systemd_localed_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_localed_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
@@ -2503,17 +2530,23 @@ endif
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
        src/login/logind.c \
+       src/login/logind.h \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
+       src/login/logind-device.h \
        src/login/logind-seat.c \
-       src/login/logind-seat-dbus.c \
+       src/login/logind-seat.h \
        src/login/logind-session.c \
-       src/login/logind-session-dbus.c \
+       src/login/logind-session.h \
        src/login/logind-user.c \
+       src/login/logind-user.h \
+       src/login/logind-session-dbus.c \
+       src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
        src/dbus-common.c \
        src/dbus-loop.c \
-       src/polkit.c
+       src/polkit.c \
+       src/login/logind-acl.h
 
 nodist_systemd_logind_SOURCES = \
        src/login/logind-gperf.c
@@ -2523,7 +2556,8 @@ systemd_logind_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_logind_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
@@ -2541,7 +2575,7 @@ systemd_user_sessions_SOURCES = \
        src/login/user-sessions.c
 
 systemd_user_sessions_LDADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-logind \
@@ -2558,7 +2592,7 @@ loginctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 loginctl_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-shared.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -2570,7 +2604,7 @@ test_login_SOURCES = \
 
 test_login_LDADD = \
        libsystemd-login.la \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 noinst_PROGRAMS += \
        test-login
@@ -2583,12 +2617,13 @@ libsystemd_login_la_CFLAGS = \
        -fvisibility=hidden
 
 libsystemd_login_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -shared \
        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-       libsystemd-shared-selinux.la
+       libsystemd-shared.la
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
@@ -2602,6 +2637,7 @@ pam_systemd_la_CFLAGS = \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -module \
        -export-dynamic \
        -avoid-version \
@@ -2609,8 +2645,9 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-audit.la \
+       libsystemd-shared.la \
        $(PAM_LIBS) \
        $(DBUS_LIBS)
 
@@ -2681,7 +2718,8 @@ systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
 systemd_multi_seat_x_LDADD = \
-       libsystemd-shared-selinux.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la
 
 rootlibexec_PROGRAMS += \
@@ -2748,12 +2786,6 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
-       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/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in