X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=969f85adfee82f86c9a9297406cf8e47fbda2005;hp=f687eca0cc2b7736293fc5957e31bc7f645f749b;hb=9f26c90cb50c45d4549c4dd569917b4ac143b94d;hpb=8f27a2212ee8d6311c88ef4358953ad0d7bfa851 diff --git a/Makefile.am b/Makefile.am index f687eca0c..969f85adf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -620,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 \ @@ -1075,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 \ @@ -1166,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 @@ -1352,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 += \ @@ -1602,7 +1612,7 @@ libsystemd_daemon_la_SOURCES = \ src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_internal_la_SOURCES = \ - $(libsystemd_daemon_la_SOURCES) + $(libsystemd_daemon_la_SOURCES) libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1631,7 +1641,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la noinst_LTLIBRARIES += \ - libsystemd-daemon-internal.la + libsystemd-daemon-internal.la pkgconfiglib_DATA += \ src/libsystemd-daemon/libsystemd-daemon.pc @@ -1640,6 +1650,78 @@ 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 \ + libsystemd-shared.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 += \ @@ -1809,7 +1891,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 \ @@ -1833,9 +1914,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 @@ -3484,6 +3576,7 @@ if HAVE_PYTHON_DEVEL pkgpyexec_LTLIBRARIES = \ _journal.la \ id128.la \ + _daemon.la \ _reader.la _journal_la_SOURCES = \ @@ -3491,7 +3584,7 @@ _journal_la_SOURCES = \ _journal_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) _journal_la_LDFLAGS = \ @@ -3512,7 +3605,7 @@ id128_la_SOURCES = \ id128_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) \ -I$(top_builddir)/src/python-systemd @@ -3526,6 +3619,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 \ @@ -3533,7 +3647,7 @@ _reader_la_SOURCES = \ _reader_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default \ + -fvisibility=default \ $(PYTHON_CFLAGS) _reader_la_LDFLAGS = \ @@ -3550,6 +3664,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 @@ -3569,7 +3684,7 @@ sphinx-%: destdir-sphinx: all dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \ $(MAKE) DESTDIR="$$dir" install && \ - $(MAKE) DESTDIR="$$dir" sphinx-html && \ + $(MAKE) DESTDIR="$$dir" sphinx-html && \ rm -rf "$$dir" endif @@ -3864,7 +3979,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) clean-local: $(CLEAN_LOCAL_HOOKS) rm -rf $(abs_srcdir)/install-tree rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \ - $(abs_srcdir)/hwdb/iab.txt + $(abs_srcdir)/hwdb/iab.txt DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ @@ -3895,7 +4010,7 @@ hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -N http://www.linux-usb.org/usb.ids \ http://pci-ids.ucw.cz/v2.2/pci.ids \ - http://standards.ieee.org/develop/regauth/oui/oui.txt \ + http://standards.ieee.org/develop/regauth/oui/oui.txt \ http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl )