chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up more unneeded functions and types in:
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index bfade430924a0e12801718233fd76adfd3770f61..fe4b811c734758d48c62398226e364d6d9d09087 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-52,6
+52,11
@@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
zshcompletiondir=@zshcompletiondir@
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
zshcompletiondir=@zshcompletiondir@
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
+
+CGROUP_CONTROLLER=@cgroup_controller@
+PKTTYAGENT=$(bindir)/pkttyagent
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
@@
-60,13
+65,13
@@
udevrulesdir=@udevrulesdir@
udevbindir=@udevbindir@
udevlibexecdir=$(udevbindir)
udevhomedir=$(udevlibexecdir)
udevbindir=@udevbindir@
udevlibexecdir=$(udevbindir)
udevhomedir=$(udevlibexecdir)
-udevhwdbdir=$(udevlibexecdir)/hwdb.d
factory_pamdir = $(datadir)/factory/etc/pam.d
# And these are the special ones for /
rootprefix=@rootprefix@
factory_pamdir = $(datadir)/factory/etc/pam.d
# And these are the special ones for /
rootprefix=@rootprefix@
+rootlibdir=@rootlibdir@
rootbindir=$(rootprefix)/bin
rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+
EXTRA_DIST =
BUILT_SOURCES =
EXTRA_DIST =
BUILT_SOURCES =
@@
-116,30
+121,28
@@
CLEANFILES = $(BUILT_SOURCES) \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -D
CERTIFICATE_ROOT=\"$(CERTIFICATEROOT
)\" \
- -D
ROOTPREFIX=\"$(rootprefix)
\" \
+ -D
ELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER
)\" \
+ -D
ELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent
\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
- -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
+ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ -DHALT=\"$(HALT)\" \
+ -DREBOOT=\"$(REBOOT)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
- -DROOTLIBDIR=\"$(rootlibdir)\" \
- -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
-I $(top_srcdir)/src/basic \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-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_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-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)
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
@@
-186,8
+189,7
@@
AM_V_RM_0 = @echo " RM " $@;
# ------------------------------------------------------------------------------
rootbin_PROGRAMS =
# ------------------------------------------------------------------------------
rootbin_PROGRAMS =
-bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
dist_doc_DATA = \
README \
dist_doc_DATA = \
README \
@@
-280,7
+282,7
@@
endif
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
- $(filter-out man/
system
d.directives.xml,$(XML_FILES)) \
+ $(filter-out man/
elogin
d.directives.xml,$(XML_FILES)) \
$(HTML_FILES) \
$(HTML_ALIAS) \
$(man_MANS) \
$(HTML_FILES) \
$(HTML_ALIAS) \
$(man_MANS) \
@@
-374,11
+376,13
@@
libbasic_la_CFLAGS = \
$(CAP_CFLAGS) \
-pthread
$(CAP_CFLAGS) \
-pthread
+libbasic_la_LDFLAGS = \
+ $(CAP_LDFLAGS)
+
libbasic_la_LIBADD = \
$(SELINUX_LIBS) \
$(CAP_LIBS) \
-ldl \
libbasic_la_LIBADD = \
$(SELINUX_LIBS) \
$(CAP_LIBS) \
-ldl \
- -lrt \
-lm
# -----------------------------------------------------------------------------
-lm
# -----------------------------------------------------------------------------
@@
-410,16
+414,12
@@
endif
libshared_la_CFLAGS = \
$(AM_CFLAGS) \
libshared_la_CFLAGS = \
$(AM_CFLAGS) \
- $(ACL_CFLAGS) \
- $(LIBIDN_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(ACL_CFLAGS)
libshared_la_LIBADD = \
libelogind-internal.la \
$(UDEV_LIBS) \
libshared_la_LIBADD = \
libelogind-internal.la \
$(UDEV_LIBS) \
- $(ACL_LIBS) \
- $(LIBIDN_LIBS) \
- $(SECCOMP_LIBS)
+ $(ACL_LIBS)
gperf_txt_sources = \
src/basic/errno-list.txt
gperf_txt_sources = \
src/basic/errno-list.txt
@@
-468,17
+468,25
@@
dist_factory_pam_DATA = \
factory/etc/pam.d/other
endif
factory/etc/pam.d/other
endif
+# ------------------------------------------------------------------------------
+pkglibexec_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 \
# ------------------------------------------------------------------------------
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 \
src/systemd/sd-login.h \
src/systemd/sd-id128.h \
src/systemd/sd-daemon.h \
- src/systemd/sd-path.h \
src/libelogind/libelogind.sym \
src/libelogind/sd-bus/sd-bus.c \
src/libelogind/sd-bus/bus-control.c \
src/libelogind/libelogind.sym \
src/libelogind/sd-bus/sd-bus.c \
src/libelogind/sd-bus/bus-control.c \
@@
-520,11
+528,9
@@
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-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-id128/sd-id128.c \
src/libelogind/sd-daemon/sd-daemon.c \
- src/libelogind/sd-login/sd-login.c \
- src/libelogind/sd-path/sd-path.c
+ src/libelogind/sd-login/sd-login.c
libelogind_internal_la_LIBADD = \
libbasic.la \
libelogind_internal_la_LIBADD = \
libbasic.la \
@@
-568,13
+574,11
@@
pkgconfiglib_DATA += \
src/libelogind/libelogind.pc
pkginclude_HEADERS += \
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-login.h \
+ src/systemd/sd-messages.h \
src/systemd/sd-id128.h \
src/systemd/sd-id128.h \
- src/systemd/sd-daemon.h
+ src/systemd/_sd-common.h
+
lib_LTLIBRARIES += \
libelogind.la
lib_LTLIBRARIES += \
libelogind.la
@@
-613,7
+617,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-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
libelogind_core_la_LIBADD = \
libshared.la
@@
-626,7
+632,7
@@
endif
noinst_LTLIBRARIES += \
libelogind-core.la
noinst_LTLIBRARIES += \
libelogind-core.la
-
root
libexec_PROGRAMS += \
+
pkg
libexec_PROGRAMS += \
elogind
loginctl_SOURCES = \
elogind
loginctl_SOURCES = \
@@
-728,7
+734,7
@@
dist_dbuspolicy_DATA += \
src/login/org.freedesktop.login1.conf
dist_pkgsysconf_DATA += \
src/login/org.freedesktop.login1.conf
dist_pkgsysconf_DATA += \
- src/login/
e
logind.conf
+ src/login/logind.conf
polkitpolicy_files += \
src/login/org.freedesktop.login1.policy
polkitpolicy_files += \
src/login/org.freedesktop.login1.policy
@@
-753,14
+759,11
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
substitutions = \
# ------------------------------------------------------------------------------
substitutions = \
- '|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|pkgdatadir=$(pkgdatadir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|pkgdatadir=$(pkgdatadir)|' \
- '|udevhwdbdir=$(udevhwdbdir)|' \
'|udevrulesdir=$(udevrulesdir)|' \
'|udevrulesdir=$(udevrulesdir)|' \
- '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
@@
-771,16
+774,8
@@
substitutions = \
'|VERSION=$(VERSION)|' \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
'|VERSION=$(VERSION)|' \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
- '|SUSHELL=$(SUSHELL)|' \
- '|SULOGIN=$(SULOGIN)|' \
- '|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|MKDIR_P=$(MKDIR_P)|' \
'|KILL=$(KILL)|' \
'|MKDIR_P=$(MKDIR_P)|' \
- '|QUOTAON=$(QUOTAON)|' \
- '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
- '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
- '|NTP_SERVERS=$(NTP_SERVERS)|' \
- '|DNS_SERVERS=$(DNS_SERVERS)|' \
'|systemuidmax=$(SYSTEM_UID_MAX)|' \
'|systemgidmax=$(SYSTEM_GID_MAX)|' \
'|TTY_GID=$(TTY_GID)|'
'|systemuidmax=$(SYSTEM_UID_MAX)|' \
'|systemgidmax=$(SYSTEM_GID_MAX)|' \
'|TTY_GID=$(TTY_GID)|'
@@
-799,9
+794,6
@@
sysctl.d/%: sysctl.d/%.in
%.pc: %.pc.in
$(SED_PROCESS)
%.pc: %.pc.in
$(SED_PROCESS)
-%.conf: %.conf.in
- $(SED_PROCESS)
-
shell-completion/%: shell-completion/%.in
$(SED_PROCESS)
shell-completion/%: shell-completion/%.in
$(SED_PROCESS)
@@
-923,8
+915,7
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--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 += \
if ENABLE_SPLIT_USR
DISTCHECK_CONFIGURE_FLAGS += \
@@
-934,10
+925,9
@@
DISTCHECK_CONFIGURE_FLAGS += \
--disable-split-usr
endif
--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)
+dist-check-help: $(rootbin_PROGRAMS)
for i in $(abspath $^); do \
if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \
echo "$(basename $$i) --help output is too wide:"; \
for i in $(abspath $^); do \
if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \
echo "$(basename $$i) --help output is too wide:"; \
@@
-945,7
+935,7
@@
dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
exit 1; \
fi; done
exit 1; \
fi; done
-dist:
dist-check-compat-libs
+dist:
.PHONY: git-tag
git-tag:
.PHONY: git-tag
git-tag:
@@
-1026,7
+1016,6
@@
test-libelogind-sym.c: \
src/systemd/sd-daemon.h \
src/systemd/sd-login.h \
src/systemd/sd-bus.h \
src/systemd/sd-daemon.h \
src/systemd/sd-login.h \
src/systemd/sd-bus.h \
- src/systemd/sd-path.h \
src/systemd/sd-event.h
$(generate-sym-test)
src/systemd/sd-event.h
$(generate-sym-test)