chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: print message direction in policy logs
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 28d2e4b53fbfdc7808490d30ffe55f1104417f6d..8a60f3fa4bdbec46333f3cb9fe6286692a763461 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-74,7
+74,6
@@
dbussessionservicedir=@dbussessionservicedir@
dbussystemservicedir=@dbussystemservicedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
dbussystemservicedir=@dbussystemservicedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
@@
-85,6
+84,7
@@
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
+xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
@@
-506,7
+506,8
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target
+ units/initrd-switch-root.target \
+ units/machines.target
if ENABLE_KDBUS
dist_systemunit_DATA += \
if ENABLE_KDBUS
dist_systemunit_DATA += \
@@
-549,7
+550,6
@@
nodist_systemunit_DATA = \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn@.service \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn@.service \
- units/machines.target \
units/systemd-update-done.service
if HAVE_UTMP
units/systemd-update-done.service
if HAVE_UTMP
@@
-886,8
+886,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/pty.h \
src/shared/async.c \
src/shared/async.h \
src/shared/pty.h \
src/shared/async.c \
src/shared/async.h \
- src/shared/copy.c \
- src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
src/shared/memfd-util.c \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
src/shared/memfd-util.c \
@@
-895,13
+893,10
@@
libsystemd_shared_la_SOURCES = \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/nss-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/nss-util.h \
- src/shared/btrfs-util.c \
- src/shared/btrfs-util.h \
- src/shared/btrfs-ctree.h \
src/shared/verbs.c \
src/shared/verbs.h \
src/shared/verbs.c \
src/shared/verbs.h \
- src/shared/
machine-image
.c \
- src/shared/
machine-image
.h \
+ src/shared/
sigbus
.c \
+ src/shared/
sigbus
.h \
src/shared/build.h
if HAVE_UTMP
src/shared/build.h
if HAVE_UTMP
@@
-926,7
+921,8
@@
libsystemd_shared_la_CFLAGS = \
-pthread
libsystemd_shared_la_LIBADD = \
-pthread
libsystemd_shared_la_LIBADD = \
- $(CAP_LIBS)
+ $(CAP_LIBS) \
+ -lm
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-966,7
+962,14
@@
libsystemd_label_la_SOURCES = \
src/shared/condition.c \
src/shared/condition.h \
src/shared/generator.h \
src/shared/condition.c \
src/shared/condition.h \
src/shared/generator.h \
- src/shared/generator.c
+ src/shared/generator.c \
+ src/shared/btrfs-util.c \
+ src/shared/btrfs-util.h \
+ src/shared/btrfs-ctree.h \
+ src/shared/machine-image.c \
+ src/shared/machine-image.h \
+ src/shared/copy.c \
+ src/shared/copy.h
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-1303,7
+1306,7
@@
dist_dbussystemservice_DATA += \
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
-pkgconfig
data_DATA
= \
+pkgconfig
lib_DATA +
= \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
@@
-1387,7
+1390,9
@@
tests += \
test-locale-util \
test-execute \
test-copy \
test-locale-util \
test-execute \
test-copy \
- test-cap-list
+ test-cap-list \
+ test-sigbus \
+ test-verbs
EXTRA_DIST += \
test/a.service \
EXTRA_DIST += \
test/a.service \
@@
-1579,6
+1584,13
@@
test_copy_SOURCES = \
src/test/test-copy.c
test_copy_LDADD = \
src/test/test-copy.c
test_copy_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
+test_sigbus_SOURCES = \
+ src/test/test-sigbus.c
+
+test_sigbus_LDADD = \
libsystemd-shared.la
test_condition_SOURCES = \
libsystemd-shared.la
test_condition_SOURCES = \
@@
-1606,7
+1618,6
@@
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
src/test/test-util.c
test_util_LDADD = \
- -lm \
libsystemd-shared.la
test_uid_range_SOURCES = \
libsystemd-shared.la
test_uid_range_SOURCES = \
@@
-1654,6
+1665,12
@@
test_tmpfiles_LDADD = \
test_namespace_SOURCES = \
src/test/test-namespace.c
test_namespace_SOURCES = \
src/test/test-namespace.c
+test_verbs_SOURCES = \
+ src/test/test-verbs.c
+
+test_verbs_LDADD = \
+ libsystemd-shared.la
+
test_namespace_LDADD = \
libsystemd-core.la
test_namespace_LDADD = \
libsystemd-core.la
@@
-1698,8
+1715,7
@@
test_json_SOURCES = \
src/test/test-json.c
test_json_LDADD = \
src/test/test-json.c
test_json_LDADD = \
- libsystemd-shared.la \
- -lm
+ libsystemd-shared.la
test_list_SOURCES = \
src/test/test-list.c
test_list_SOURCES = \
src/test/test-list.c
@@
-1778,6
+1794,7
@@
test_btrfs_SOURCES = \
src/test/test-btrfs.c
test_btrfs_LDADD = \
src/test/test-btrfs.c
test_btrfs_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la
test_rtnl_manual_SOURCES = \
libsystemd-shared.la
test_rtnl_manual_SOURCES = \
@@
-2459,6
+2476,9
@@
dbus1-generator-install-hook:
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+dist_xinitrc_SCRIPTS = \
+ xorg/50-systemd-user.sh
+
INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
endif
INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
endif
@@
-3770,7
+3790,8
@@
v4l_id_SOURCES = \
src/udev/v4l_id/v4l_id.c
v4l_id_LDADD = \
src/udev/v4l_id/v4l_id.c
v4l_id_LDADD = \
- libudev-internal.la
+ libudev-internal.la \
+ libsystemd-shared.la
udevlibexec_PROGRAMS += \
v4l_id
udevlibexec_PROGRAMS += \
v4l_id
@@
-3783,7
+3804,7
@@
accelerometer_SOURCES = \
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
- libudev-internal.la
-lm
\
+ libudev-internal.la \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
libsystemd-shared.la
udevlibexec_PROGRAMS += \
@@
-4330,16
+4351,15
@@
libsystemd_journal_internal_la_SOURCES = \
src/journal/catalog.c \
src/journal/catalog.h \
src/journal/mmap-cache.c \
src/journal/catalog.c \
src/journal/catalog.h \
src/journal/mmap-cache.c \
- src/journal/mmap-cache.h
+ src/journal/mmap-cache.h \
+ src/journal/compress.c
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
libsystemd_journal_internal_la_CFLAGS = \
$(AM_CFLAGS)
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
libsystemd_journal_internal_la_CFLAGS = \
$(AM_CFLAGS)
-libsystemd_journal_internal_la_LIBADD =
-
-libsystemd_journal_internal_la_SOURCES += \
- src/journal/compress.c
+libsystemd_journal_internal_la_LIBADD = \
+ libsystemd-label.la
if HAVE_XZ
libsystemd_journal_internal_la_CFLAGS += \
if HAVE_XZ
libsystemd_journal_internal_la_CFLAGS += \
@@
-4979,8
+4999,7
@@
systemd_timesyncd_LDADD = \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-shared.la \
- -lm
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-timesyncd
rootlibexec_PROGRAMS += \
systemd-timesyncd
@@
-5044,6
+5063,7
@@
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.h \
src/machine/machined-dbus.c \
src/machine/machine-dbus.c \
src/machine/machine.h \
src/machine/machined-dbus.c \
src/machine/machine-dbus.c \
+ src/machine/machine-dbus.h \
src/machine/image-dbus.c \
src/machine/image-dbus.h
src/machine/image-dbus.c \
src/machine/image-dbus.h
@@
-5061,6
+5081,8
@@
machinectl_SOURCES = \
machinectl_LDADD = \
libsystemd-internal.la \
machinectl_LDADD = \
libsystemd-internal.la \
+ libsystemd-logs.la \
+ libsystemd-journal-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
libsystemd-shared.la
rootbin_PROGRAMS += \
@@
-5154,9
+5176,9
@@
systemd_import_CFLAGS = \
systemd_import_LDADD = \
libsystemd-internal.la \
systemd_import_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la \
libsystemd-shared.la \
- $(LIBCURL_LIBS) \
- -lm
+ $(LIBCURL_LIBS)
endif
endif
endif
endif
@@
-5218,7
+5240,6
@@
systemd_resolved_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
- -lm \
$(LIBIDN_LIBS)
rootlibexec_PROGRAMS += \
$(LIBIDN_LIBS)
rootlibexec_PROGRAMS += \
@@
-5286,8
+5307,8
@@
libnss_resolve_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
libnss_resolve_la_LIBADD = \
-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
libnss_resolve_la_LIBADD = \
- libsystemd-
shared
.la \
- libsystemd-
internal
.la
+ libsystemd-
internal
.la \
+ libsystemd-
shared
.la
lib_LTLIBRARIES += \
libnss_resolve.la
lib_LTLIBRARIES += \
libnss_resolve.la
@@
-5312,7
+5333,6
@@
systemd_resolve_host_SOURCES = \
systemd_resolve_host_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
systemd_resolve_host_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
- -lm \
$(LIBIDN_LIBS)
rootlibexec_PROGRAMS += \
$(LIBIDN_LIBS)
rootlibexec_PROGRAMS += \
@@
-5522,6
+5542,8
@@
loginctl_SOURCES = \
loginctl_LDADD = \
libsystemd-internal.la \
loginctl_LDADD = \
libsystemd-internal.la \
+ libsystemd-logs.la \
+ libsystemd-journal-internal.la \
libudev-internal.la \
libsystemd-shared.la
libudev-internal.la \
libsystemd-shared.la
@@
-6082,7
+6104,6
@@
EXTRA_DIST += \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)