X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8ecfb74a6a1ea84672d8841c55402420ab492f88;hp=3073b0df84b8d857edb6ebd4ca764216d03ba5db;hb=b588b3c4568bfa093aea6f01b82c3edfe00de11e;hpb=946f1825751919a176cd0039002a514de0c9c70f diff --git a/Makefile.am b/Makefile.am index 3073b0df8..8ecfb74a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -330,6 +330,9 @@ dist_tmpfiles_DATA = \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf +dist_sysctl_DATA = \ + sysctl.d/50-default.conf + if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ tmpfiles.d/legacy.conf @@ -347,8 +350,9 @@ dist_systemunit_DATA = \ units/kexec.target \ units/local-fs.target \ units/local-fs-pre.target \ + units/initrd.target \ units/initrd-fs.target \ - units/root-fs.target \ + units/initrd-root-fs.target \ units/remote-fs.target \ units/remote-fs-pre.target \ units/network.target \ @@ -471,8 +475,7 @@ EXTRA_DIST += \ units/initrd-cleanup.service.in \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ - introspect.awk \ - man/custom-html.xsl + introspect.awk CLEANFILES += \ units/console-shell.service.m4 \ @@ -617,6 +620,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/set.h \ src/shared/fdset.c \ src/shared/fdset.h \ + src/shared/prioq.c \ + src/shared/prioq.h \ src/shared/strv.c \ src/shared/strv.h \ src/shared/env-util.c \ @@ -1072,7 +1077,8 @@ noinst_tests += \ test-sched-prio \ test-calendarspec \ test-strip-tab-ansi \ - test-cgroup-util + test-cgroup-util \ + test-prioq EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1163,6 +1169,15 @@ test_util_CFLAGS = \ test_util_LDADD = \ libsystemd-core.la +test_prioq_SOURCES = \ + src/test/test-prioq.c + +test_prioq_CFLAGS = \ + $(AM_CFLAGS) + +test_prioq_LDADD = \ + libsystemd-core.la + test_log_SOURCES = \ src/test/test-log.c @@ -1349,12 +1364,10 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-modules-load.service + SYSINIT_TARGET_WANTS += \ systemd-modules-load.service -dist_udevrules_DATA += \ - rules/80-drivers.rules - endif EXTRA_DIST += \ @@ -1637,6 +1650,77 @@ EXTRA_DIST += \ src/libsystemd-daemon/libsystemd-daemon.pc.in \ src/libsystemd-daemon/libsystemd-daemon.sym +# ------------------------------------------------------------------------------ +libsystemd_bus_la_SOURCES = \ + src/libsystemd-bus/sd-bus.c \ + src/libsystemd-bus/sd-bus.h \ + src/libsystemd-bus/sd-bus-protocol.h \ + src/libsystemd-bus/bus-control.c \ + src/libsystemd-bus/bus-error.c \ + src/libsystemd-bus/bus-error.h \ + src/libsystemd-bus/bus-internal.c \ + src/libsystemd-bus/bus-internal.h \ + src/libsystemd-bus/bus-message.c \ + src/libsystemd-bus/bus-message.h \ + src/libsystemd-bus/bus-signature.c \ + src/libsystemd-bus/bus-signature.h \ + src/libsystemd-bus/bus-type.c \ + src/libsystemd-bus/bus-type.h + +libsystemd_bus_la_LIBADD = \ + libsystemd-id128-internal.la + +noinst_LTLIBRARIES += \ + libsystemd-bus.la + +noinst_tests += \ + test-bus-marshal \ + test-bus-signature \ + test-bus-chat + +noinst_PROGRAMS += \ + busctl + +test_bus_marshal_SOURCES = \ + src/libsystemd-bus/test-bus-marshal.c + +test_bus_marshal_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) + +test_bus_marshal_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +test_bus_signature_SOURCES = \ + src/libsystemd-bus/test-bus-signature.c + +test_bus_signature_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + +test_bus_chat_SOURCES = \ + src/libsystemd-bus/test-bus-chat.c + +test_bus_chat_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +test_bus_chat_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + +busctl_SOURCES = \ + src/libsystemd-bus/busctl.c + +busctl_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC SUBDIRS += \ @@ -1806,7 +1890,6 @@ libudev_core_la_SOURCES = \ src/udev/udev-ctrl.c \ src/udev/udev-builtin.c \ src/udev/udev-builtin-btrfs.c \ - src/udev/udev-builtin-firmware.c \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-net_id.c \ @@ -1830,9 +1913,20 @@ libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" +if ENABLE_FIRMWARE +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-firmware.c + +dist_udevrules_DATA += \ + rules/50-firmware.rules +endif + if HAVE_KMOD libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c + +dist_udevrules_DATA += \ + rules/80-drivers.rules endif if HAVE_BLKID @@ -2776,14 +2870,14 @@ dist_bashcompletion_DATA += \ shell-completion/bash/systemd-coredumpctl sysctl_DATA = \ - sysctl.d/coredump.conf + sysctl.d/50-coredump.conf CLEANFILES += \ - sysctl.d/coredump.conf + sysctl.d/50-coredump.conf endif EXTRA_DIST += \ - sysctl.d/coredump.conf.in + sysctl.d/50-coredump.conf.in # ------------------------------------------------------------------------------ if ENABLE_BINFMT @@ -2882,7 +2976,8 @@ systemd_bootchart_SOURCES = \ src/bootchart/bootchart.h \ src/bootchart/store.c \ src/bootchart/store.h \ - src/bootchart/svg.c + src/bootchart/svg.c \ + src/bootchart/svg.h systemd_bootchart_LDADD = \ libsystemd-shared.la @@ -3356,7 +3451,8 @@ libsystemd_login_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym libsystemd_login_la_LIBADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon-internal.la libsystemd_login_internal_la_SOURCES = \ $(libsystemd_login_la_SOURCES) @@ -3479,6 +3575,7 @@ if HAVE_PYTHON_DEVEL pkgpyexec_LTLIBRARIES = \ _journal.la \ id128.la \ + _daemon.la \ _reader.la _journal_la_SOURCES = \ @@ -3521,6 +3618,27 @@ id128_la_LIBADD = \ $(PYTHON_LIBS) \ libsystemd-id128.la +_daemon_la_SOURCES = \ + src/python-systemd/_daemon.c \ + src/python-systemd/pyutil.c \ + src/python-systemd/pyutil.h + +_daemon_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) \ + -I$(top_builddir)/src/python-systemd + +_daemon_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +_daemon_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-daemon.la + _reader_la_SOURCES = \ src/python-systemd/_reader.c \ src/python-systemd/pyutil.c \ @@ -3545,6 +3663,7 @@ _reader_la_LIBADD = \ dist_pkgpyexec_PYTHON = \ src/python-systemd/journal.py \ + src/python-systemd/daemon.py \ src/python-systemd/__init__.py src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile @@ -3718,6 +3837,10 @@ endef endif +EXTRA_DIST += \ + man/custom-html.xsl \ + man/custom-man.xsl + # ------------------------------------------------------------------------------ DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h