main: added support for loading IMA custom policies

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5d987147b30732884221b80a4a7e63e0d20ae759..6d0b51a0903389372e73be322c9870c75ad8f383 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -29,11 +29,11 @@ LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
+LIBSYSTEMD_ID128_REVISION=3
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=2
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -177,12 +177,6 @@ bin_PROGRAMS = \
 dist_bin_SCRIPTS = \
        src/systemd-analyze
 
-if HAVE_GTK
-bin_PROGRAMS += \
-       systemadm \
-       systemd-gnome-ask-password-agent
-endif
-
 rootlibexec_PROGRAMS = \
        systemd \
        systemd-cgroups-agent \
@@ -291,7 +285,6 @@ dist_systemunit_DATA = \
        units/dev-mqueue.mount \
        units/sys-kernel-config.mount \
        units/sys-kernel-debug.mount \
-       units/sys-kernel-security.mount \
        units/sys-fs-fuse-connections.mount \
        units/var-run.mount \
        units/media.mount \
@@ -517,6 +510,7 @@ libsystemd_core_la_SOURCES = \
        src/mount-setup.c \
        src/hostname-setup.c \
        src/selinux-setup.c \
+       src/ima-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
@@ -656,7 +650,6 @@ EXTRA_DIST += \
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
-       man/systemadm.1 \
        man/systemd-cgls.1 \
        man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
@@ -1036,52 +1029,6 @@ systemd_stdio_bridge_SOURCES = \
 systemd_stdio_bridge_LDADD = \
        libsystemd-basic.la
 
-systemadm_SOURCES = \
-       src/systemadm.vala \
-       src/systemd-interfaces.vala \
-       src/wraplabel.vala
-
-systemadm_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemadm_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=gee-1.0 \
-       -g
-
-systemadm_LDADD = \
-       $(GTK_LIBS)
-
-systemd_gnome_ask_password_agent_SOURCES = \
-       src/gnome-ask-password-agent.vala
-
-systemd_gnome_ask_password_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBNOTIFY_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=linux \
-       --pkg=gio-unix-2.0 \
-       --pkg=libnotify \
-       -g
-
-systemd_gnome_ask_password_agent_LDADD = \
-       $(LIBNOTIFY_LIBS) \
-       $(GTK_LIBS)
-
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent.c \
        src/ask-password-api.c \
@@ -2192,11 +2139,6 @@ CLEANFILES += \
        src/load-fragment-gperf-nulstr.c \
        src/99-systemd.rules
 
-if HAVE_VALAC
-CLEANFILES += \
-       ${systemadm_SOURCES:.vala=.c}
-endif
-
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
@@ -2349,7 +2291,6 @@ systemd-install-data-hook:
                        dev-mqueue.mount \
                        sys-kernel-config.mount \
                        sys-kernel-debug.mount \
-                       sys-kernel-security.mount \
                        sys-fs-fuse-connections.mount \
                        systemd-modules-load.service \
                        systemd-tmpfiles-setup.service \
@@ -2359,7 +2300,6 @@ systemd-install-data-hook:
                $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
                $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
                $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
-               $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
                $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \