chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libbasic_la_LDFLAGS : Add CAP_LDFLAGS.
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 34de5ea38f1b84bb6949f532bb7bc7ad09e1faed..fb59c77f70ce57b27b67295dca3e7528d6c75b99 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-52,6
+52,8
@@
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
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
@@
-60,7
+62,6
@@
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 /
factory_pamdir = $(datadir)/factory/etc/pam.d
# And these are the special ones for /
@@
-116,11
+117,14
@@
CLEANFILES = $(BUILT_SOURCES) \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
-DROOTPREFIX=\"$(rootprefix)\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
-DROOTPREFIX=\"$(rootprefix)\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ -DHALT=\"$(HALT)\" \
+ -DREBOOT=\"$(REBOOT)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
@@
-129,18
+133,14
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
-I $(top_srcdir)/src/basic \
-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)
@@
-194,8
+194,7
@@
dist_doc_DATA = \
README \
NEWS \
LICENSE.LGPL2.1 \
README \
NEWS \
LICENSE.LGPL2.1 \
- LICENSE.GPL2 \
- DISTRO_PORTING
+ LICENSE.GPL2
@INTLTOOL_POLICY_RULE@
@INTLTOOL_POLICY_RULE@
@@
-241,18
+240,18
@@
CLEANFILES += \
docs/html/man
if HAVE_PYTHON
docs/html/man
if HAVE_PYTHON
-man/index.html: man/
system
d.index.html
- $(AM_V_LN)$(LN_S) -f
system
d.index.html $@
+man/index.html: man/
elogin
d.index.html
+ $(AM_V_LN)$(LN_S) -f
elogin
d.index.html $@
noinst_DATA += \
noinst_DATA += \
- man/index.html
+ man/index.html
CLEANFILES += \
CLEANFILES += \
- man/index.html
+ man/index.html
XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
-NON_INDEX_XML_FILES = $(filter-out man/
system
d.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/
system
d.directives.xml,$(NON_INDEX_XML_FILES))}
+NON_INDEX_XML_FILES = $(filter-out man/
elogin
d.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/
elogin
d.directives.xml,$(NON_INDEX_XML_FILES))}
# This target should only be run manually. It recreates Makefile-man.am
# file in the source directory based on all man/*.xml files. Run it after
# This target should only be run manually. It recreates Makefile-man.am
# file in the source directory based on all man/*.xml files. Run it after
@@
-260,29
+259,29
@@
SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directi
update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
- @echo "Makefile-man.am has been regenerated"
+
@echo "Makefile-man.am has been regenerated"
-man/
system
d.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+man/
elogin
d.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
-man/
system
d.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+man/
elogin
d.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
CLEANFILES += \
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
CLEANFILES += \
- man/
system
d.index.xml \
- man/
system
d.directives.xml
+ man/
elogin
d.index.xml \
+ man/
elogin
d.directives.xml
EXTRA_DIST += \
EXTRA_DIST += \
- tools/make-man-rules.py
+ tools/make-man-rules.py
endif
endif
EXTRA_DIST += \
endif
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) \
@@
-376,11
+375,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
# -----------------------------------------------------------------------------
@@
-412,16
+413,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
@@
-472,13
+469,13
@@
endif
# ------------------------------------------------------------------------------
rootlibexec_PROGRAMS += \
# ------------------------------------------------------------------------------
rootlibexec_PROGRAMS += \
- elogind-cgroups-agent
+ elogind-cgroups-agent
elogind_cgroups_agent_SOURCES = \
elogind_cgroups_agent_SOURCES = \
- src/cgroups-agent/cgroups-agent.c
+ src/cgroups-agent/cgroups-agent.c
elogind_cgroups_agent_LDADD = \
elogind_cgroups_agent_LDADD = \
- libshared.la
+ libshared.la
# ------------------------------------------------------------------------------
libelogind_internal_la_SOURCES = \
# ------------------------------------------------------------------------------
libelogind_internal_la_SOURCES = \
@@
-486,11
+483,9
@@
libelogind_internal_la_SOURCES = \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
src/systemd/sd-event.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 \
@@
-532,11
+527,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 \
@@
-580,13
+573,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
@@
-625,7
+616,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
@@
-740,7
+733,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
@@
-770,9
+763,7
@@
substitutions = \
'|bindir=$(bindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|pkgdatadir=$(pkgdatadir)|' \
'|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)|' \
@@
-783,18
+774,8
@@
substitutions = \
'|VERSION=$(VERSION)|' \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
'|VERSION=$(VERSION)|' \
'|rootprefix=$(rootprefix)|' \
'|udevlibexecdir=$(udevlibexecdir)|' \
- '|SUSHELL=$(SUSHELL)|' \
- '|SULOGIN=$(SULOGIN)|' \
- '|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \
'|KILL=$(KILL)|' \
- '|KMOD=$(KMOD)|' \
'|MKDIR_P=$(MKDIR_P)|' \
'|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)|' \
- '|PYTHON=$(PYTHON)|' \
- '|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)|'
@@
-813,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)
@@
-937,12
+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
-
-DISTCHECK_CONFIGURE_FLAGS += \
- --with-sysvinit-path= \
- --with-sysvrcnd-path=
+ --with-rootprefix=$$dc_install_base
if ENABLE_SPLIT_USR
DISTCHECK_CONFIGURE_FLAGS += \
if ENABLE_SPLIT_USR
DISTCHECK_CONFIGURE_FLAGS += \
@@
-952,13
+925,7
@@
DISTCHECK_CONFIGURE_FLAGS += \
--disable-split-usr
endif
--disable-split-usr
endif
-#
-# Require python when making dist
-#
-.PHONY: dist-check-python dist-check-compat-libs dist-check-help
-dist-check-python:
-
-dist-check-compat-libs:
+.PHONY: dist-check-help
dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
for i in $(abspath $^); do \
dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
for i in $(abspath $^); do \
@@
-968,7
+935,7
@@
dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
exit 1; \
fi; done
exit 1; \
fi; done
-dist:
dist-check-python dist-check-compat-libs
+dist:
.PHONY: git-tag
git-tag:
.PHONY: git-tag
git-tag:
@@
-1049,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)