Remove support for auto-spawning VTs

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd7035f48ac2855d07e5985fa4e55d1040aa8c43..d84cfd6f271f8820e80b786ff78bf61a4e1cad11 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,6 +115,7 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
+       -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -126,18 +127,14 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src \
        -I $(top_builddir)/src/basic \
        -I $(top_srcdir)/src/basic \
+       -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/shared \
        -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/systemd \
-       -I $(top_builddir)/src/core \
-       -I $(top_srcdir)/src/libudev \
-       -I $(top_srcdir)/src/udev \
-       -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libelogind/sd-bus \
        -I $(top_srcdir)/src/libelogind/sd-event \
        -I $(top_srcdir)/src/libelogind/sd-login \
-       -I $(top_srcdir)/src/libelogind/sd-netlink \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -278,7 +275,7 @@ endif
 endif
 
 EXTRA_DIST += \
-       $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
+       $(filter-out man/elogind.directives.xml,$(XML_FILES)) \
        $(HTML_FILES) \
        $(HTML_ALIAS) \
        $(man_MANS) \
@@ -376,7 +373,6 @@ libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
        -ldl \
-       -lrt \
        -lm
 
 # -----------------------------------------------------------------------------
@@ -408,16 +404,12 @@ endif
 
 libshared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(ACL_CFLAGS) \
-       $(LIBIDN_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(ACL_CFLAGS)
 
 libshared_la_LIBADD = \
        libelogind-internal.la \
        $(UDEV_LIBS) \
-       $(ACL_LIBS) \
-       $(LIBIDN_LIBS) \
-       $(SECCOMP_LIBS)
+       $(ACL_LIBS)
 
 gperf_txt_sources = \
        src/basic/errno-list.txt
@@ -466,13 +458,22 @@ dist_factory_pam_DATA = \
        factory/etc/pam.d/other
 endif
 
+# ------------------------------------------------------------------------------
+rootlibexec_PROGRAMS += \
+       elogind-cgroups-agent
+
+elogind_cgroups_agent_SOURCES = \
+       src/cgroups-agent/cgroups-agent.c
+
+elogind_cgroups_agent_LDADD = \
+       libshared.la
+
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
        src/systemd/sd-event.h \
-       src/systemd/sd-netlink.h \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h \
@@ -517,7 +518,6 @@ libelogind_internal_la_SOURCES = \
        src/libelogind/sd-bus/bus-slot.h \
        src/libelogind/sd-bus/bus-protocol.h \
        src/libelogind/sd-event/sd-event.c \
-       src/libelogind/sd-event/event-util.h \
        src/libelogind/sd-id128/sd-id128.c \
        src/libelogind/sd-daemon/sd-daemon.c \
        src/libelogind/sd-login/sd-login.c
@@ -564,13 +564,11 @@ pkgconfiglib_DATA += \
        src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-       src/systemd/sd-bus.h \
-       src/systemd/sd-bus-protocol.h \
-       src/systemd/sd-bus-vtable.h \
-       src/systemd/sd-event.h \
        src/systemd/sd-login.h \
+       src/systemd/sd-messages.h \
        src/systemd/sd-id128.h \
-       src/systemd/sd-daemon.h
+       src/systemd/_sd-common.h
+
 
 lib_LTLIBRARIES += \
        libelogind.la
@@ -609,7 +607,9 @@ libelogind_core_la_SOURCES = \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
        src/login/logind-utmp.c \
-       src/login/logind-acl.h
+       src/login/logind-acl.h \
+       src/core/cgroup.h \
+       src/core/cgroup.c
 
 libelogind_core_la_LIBADD = \
        libshared.la
@@ -909,8 +909,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-       --with-rootprefix=$$dc_install_base \
-       --enable-compat-libs
+       --with-rootprefix=$$dc_install_base
 
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -920,8 +919,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --disable-split-usr
 endif
 
-.PHONY: dist-check-compat-libs dist-check-help
-dist-check-compat-libs:
+.PHONY: dist-check-help
 
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
@@ -931,7 +929,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-compat-libs
+dist:
 
 .PHONY: git-tag
 git-tag: