chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5f80306dd335e2bc1d18550649862476c4e3e7cb..00218b77ba59902a7bafc2689b667e4b79ed968c 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
@@
-769,6
+769,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
+ src/shared/fstab-util.c \
+ src/shared/fstab-util.h \
src/shared/path-util.c \
src/shared/path-util.h \
src/shared/time-util.c \
src/shared/path-util.c \
src/shared/path-util.h \
src/shared/time-util.c \
@@
-886,8
+888,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
+895,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
+923,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
+964,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) \
@@
-977,6
+982,24
@@
libsystemd_label_la_LIBADD = \
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+if HAVE_LIBIPTC
+noinst_LTLIBRARIES += \
+ libsystemd-fw.la
+
+libsystemd_fw_la_SOURCES = \
+ src/shared/fw-util.h \
+ src/shared/fw-util.c
+
+libsystemd_fw_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+libsystemd_fw_la_LIBADD = \
+ $(LIBIPTC_LIBS)
+endif
+
+# -----------------------------------------------------------------------------
+
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@
-1303,7
+1326,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 = \
@@
-1329,7
+1352,8
@@
manual_tests += \
test-watchdog \
test-log \
test-ipcrm \
test-watchdog \
test-log \
test-ipcrm \
- test-btrfs
+ test-btrfs \
+ test-fw-util
if HAVE_KMOD
manual_tests += \
if HAVE_KMOD
manual_tests += \
@@
-1351,6
+1375,7
@@
tests += \
test-utf8 \
test-ellipsize \
test-util \
test-utf8 \
test-ellipsize \
test-util \
+ test-path-lookup \
test-ring \
test-barrier \
test-pty \
test-ring \
test-barrier \
test-pty \
@@
-1363,6
+1388,7
@@
tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
+ test-fstab-util \
test-prioq \
test-fileio \
test-time \
test-prioq \
test-fileio \
test-time \
@@
-1387,7
+1413,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
+1607,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 = \
@@
-1596,6
+1631,12
@@
test_fdset_LDADD = \
libsystemd-shared.la \
libsystemd-internal.la
libsystemd-shared.la \
libsystemd-internal.la
+test_fstab_util_SOURCES = \
+ src/test/test-fstab-util.c
+
+test_fstab_util_LDADD = \
+ libsystemd-shared.la
+
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
@@
-1606,7
+1647,14
@@
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
src/test/test-util.c
test_util_LDADD = \
+ libsystemd-shared.la
+
+test_path_lookup_SOURCES = \
+ src/test/test-path-lookup.c
+
+test_path_lookup_LDADD = \
-lm \
-lm \
+ libsystemd-units.la \
libsystemd-shared.la
test_uid_range_SOURCES = \
libsystemd-shared.la
test_uid_range_SOURCES = \
@@
-1654,6
+1702,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
+1752,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,8
+1831,21
@@
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
libsystemd-shared.la
+test_fw_util_SOURCES = \
+ src/test/test-fw-util.c
+
+test_fw_util_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBIPTC_CFLAGS)
+
+test_fw_util_LDADD = \
+ libsystemd-fw.la \
+ libsystemd-shared.la \
+ $(LIBIPTC_LIBS)
+
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
@@
-2459,6
+2525,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
@@
-2589,6
+2658,11
@@
systemd_nspawn_LDADD += \
$(SECCOMP_LIBS)
endif
$(SECCOMP_LIBS)
endif
+if HAVE_LIBIPTC
+systemd_nspawn_LDADD += \
+ libsystemd-fw.la
+endif
+
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
@@
-3440,6
+3514,7
@@
dist_udevrules_DATA += \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
+ rules/60-evdev_id.rules \
rules/60-keyboard.rules \
rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
rules/60-keyboard.rules \
rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
@@
-3523,6
+3598,7
@@
libudev_core_la_SOURCES = \
src/udev/udev-builtin.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-hwdb.c \
+ src/udev/udev-builtin-evdev_id.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
@@
-3770,7
+3846,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
+3860,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
+4407,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 += \
@@
-4399,6
+4475,7
@@
dist_catalog_DATA = \
catalog/systemd.fr.catalog \
catalog/systemd.it.catalog \
catalog/systemd.pl.catalog \
catalog/systemd.fr.catalog \
catalog/systemd.it.catalog \
catalog/systemd.pl.catalog \
+ catalog/systemd.pt_BR.catalog \
catalog/systemd.ru.catalog \
catalog/systemd.catalog
catalog/systemd.ru.catalog \
catalog/systemd.catalog
@@
-4979,8
+5056,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
+5120,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
+5138,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
+5233,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
+5297,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
+5364,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
+5390,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 += \
@@
-5331,6
+5408,11
@@
systemd_networkd_SOURCES = \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+systemd_networkd_LDADD += \
+ libsystemd-fw.la
+endif
+
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
@@
-5421,6
+5503,11
@@
test_network_SOURCES = \
test_network_LDADD = \
libsystemd-networkd-core.la
test_network_LDADD = \
libsystemd-networkd-core.la
+if HAVE_LIBIPTC
+test_network_LDADD += \
+ libsystemd-fw.la
+endif
+
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
@@
-5522,6
+5609,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
+6171,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)