chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bash-completion: add systemd-run
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5d3599386fc062b15640e531054a1869aa7d3364..ea223e98cd445f158653ddafe962ba777cd6d9ee 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-64,6
+64,7
@@
dbussessionservicedir=@dbussessionservicedir@
dbussystemservicedir=@dbussystemservicedir@
dbusinterfacedir=@dbusinterfacedir@
pamlibdir=@pamlibdir@
dbussystemservicedir=@dbussystemservicedir@
dbusinterfacedir=@dbusinterfacedir@
pamlibdir=@pamlibdir@
+pamconfdir=@pamconfdir@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
@@
-340,6
+341,7
@@
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
+ shell-completion/bash/systemd-run \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
@@
-1143,6
+1145,9
@@
EXTRA_DIST += \
test/sched_rr_ok.service \
test/sched_rr_change.service
test/sched_rr_ok.service \
test/sched_rr_change.service
+EXTRA_DIST += \
+ src/test/test-helper.h
+
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1341,7
+1346,8
@@
test_cgroup_util_SOURCES = \
test_cgroup_util_LDADD = \
libsystemd-label.la \
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
test_env_replace_SOURCES = \
src/test/test-env-replace.c
test_env_replace_SOURCES = \
src/test/test-env-replace.c
@@
-1705,6
+1711,7
@@
bin_PROGRAMS += \
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
+if HAVE_BLKID
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
@@
-1721,6
+1728,7
@@
systemd_gpt_auto_generator_LDADD = \
systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
@@
-2680,7
+2688,8
@@
test_id128_SOURCES = \
test_id128_LDADD = \
libsystemd-shared.la \
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la
tests += \
test-id128
tests += \
test-id128
@@
-2852,6
+2861,10
@@
test_mmap_cache_LDADD = \
test_catalog_SOURCES = \
src/journal/test-catalog.c
test_catalog_SOURCES = \
src/journal/test-catalog.c
+test_catalog_CFLAGS = \
+ $(AM_CFLAGS) \
+ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.la \
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.la \
@@
-3894,6
+3907,9
@@
pam_systemd_la_LIBADD = \
pamlib_LTLIBRARIES = \
pam_systemd.la
pamlib_LTLIBRARIES = \
pam_systemd.la
+
+dist_pamconf_DATA = \
+ src/login/systemd-user
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
@@
-4136,6
+4152,11
@@
CLEAN_LOCAL_HOOKS += clean-sphinx
clean-sphinx:
-rm -rf docs/html/python-systemd/
clean-sphinx:
-rm -rf docs/html/python-systemd/
+# Remove Python stuff, e.g. to force rebuilding for a different Python version.
+clean-python:
+ -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
+ -rm -f _daemon.la id128.la _journal.la login.la _reader.la
+
# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
@@
-4444,6
+4465,7
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
--with-rootprefix=$$dc_install_base \
--disable-split-usr