chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tests: add some silly tests for path-util.c
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2a010c7ed2a28a313a727b621086c77906391fbc..86ad16888a075763c37fbe069dde99bf4f01e607 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,28 +31,28 @@ SUBDIRS = . po
 # keep intermediate files
 .SECONDARY:
 
-LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=2
+LIBUDEV_CURRENT=4
+LIBUDEV_REVISION=1
+LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=4
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=7
+LIBSYSTEMD_DAEMON_REVISION=8
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=17
+LIBSYSTEMD_ID128_REVISION=19
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=8
 
 # Dirs of external packages
@@ -138,7 +138,7 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-       -DCATALOG_PATH=\"$(catalogstatedir)\" \
+       -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@ -193,8 +193,8 @@ SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
-BASIC_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
+TIMERS_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
 USER_UNIT_ALIASES =
@@ -211,8 +211,8 @@ install-target-wants-hook:
        what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
        what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
-       what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+       what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
 
 define add-wants
        [ -z "$$what" ] || ( \
@@ -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,11 +350,13 @@ 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 \
+       units/network-online.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
        units/hibernate.target \
@@ -367,6 +372,8 @@ dist_systemunit_DATA = \
        units/sigpwr.target \
        units/sleep.target \
        units/sockets.target \
+       units/timers.target \
+       units/paths.target \
        units/suspend.target \
        units/swap.target \
        units/systemd-initctl.socket \
@@ -471,8 +478,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 +623,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 \
@@ -788,7 +796,8 @@ libsystemd_acl_la_CFLAGS = \
        $(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-       $(ACL_LIBS)
+       $(ACL_LIBS) \
+       libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -1062,6 +1071,7 @@ noinst_tests += \
        test-env-replace \
        test-strbuf \
        test-strv \
+       test-path-util \
        test-strxcpyx \
        test-unit-name \
        test-unit-file \
@@ -1072,7 +1082,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 +1174,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
 
@@ -1240,6 +1260,12 @@ test_strv_LDADD = \
        libsystemd-units.la \
        libsystemd-id128-internal.la
 
+test_path_util_SOURCES = \
+       src/test/test-path-util.c
+
+test_path_util_LDADD = \
+       libsystemd-shared.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -1349,12 +1375,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 += \
@@ -1599,7 +1623,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) \
@@ -1628,7 +1652,7 @@ lib_LTLIBRARIES += \
        libsystemd-daemon.la
 
 noinst_LTLIBRARIES += \
-        libsystemd-daemon-internal.la
+       libsystemd-daemon-internal.la
 
 pkgconfiglib_DATA += \
        src/libsystemd-daemon/libsystemd-daemon.pc
@@ -1637,6 +1661,80 @@ 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-socket.c \
+       src/libsystemd-bus/bus-socket.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 += \
@@ -1747,9 +1845,9 @@ dist_udevrules_DATA += \
        rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
-       hwdb/20-pci-vendor-product.hwdb \
+       hwdb/20-pci-vendor-model.hwdb \
        hwdb/20-pci-classes.hwdb \
-       hwdb/20-usb-vendor-product.hwdb \
+       hwdb/20-usb-vendor-model.hwdb \
        hwdb/20-usb-classes.hwdb \
        hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
@@ -1806,7 +1904,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 +1927,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
@@ -2408,6 +2516,11 @@ journalctl_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-logs.la
 
+if HAVE_ACL
+journalctl_LDADD += \
+       libsystemd-acl.la
+endif
+
 if HAVE_QRENCODE
 journalctl_SOURCES += \
        src/journal/journal-qrcode.c \
@@ -2642,8 +2755,7 @@ UNINSTALL_DATA_HOOKS += \
        catalog-remove-hook
 
 noinst_PROGRAMS += \
-       test-journal-enum \
-       test-catalog
+       test-journal-enum
 
 noinst_tests += \
        test-journal \
@@ -2652,7 +2764,8 @@ noinst_tests += \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \
-       test-mmap-cache
+       test-mmap-cache \
+       test-catalog
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -2776,14 +2889,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 +2995,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 +3470,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 +3594,7 @@ if HAVE_PYTHON_DEVEL
 pkgpyexec_LTLIBRARIES = \
        _journal.la \
        id128.la \
+       _daemon.la \
        _reader.la
 
 _journal_la_SOURCES = \
@@ -3486,7 +3602,7 @@ _journal_la_SOURCES = \
 
 _journal_la_CFLAGS = \
        $(AM_CFLAGS) \
-        -fvisibility=default \
+       -fvisibility=default \
        $(PYTHON_CFLAGS)
 
 _journal_la_LDFLAGS = \
@@ -3507,7 +3623,7 @@ id128_la_SOURCES = \
 
 id128_la_CFLAGS = \
        $(AM_CFLAGS) \
-        -fvisibility=default \
+       -fvisibility=default \
        $(PYTHON_CFLAGS) \
        -I$(top_builddir)/src/python-systemd
 
@@ -3521,6 +3637,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 \
@@ -3528,7 +3665,7 @@ _reader_la_SOURCES = \
 
 _reader_la_CFLAGS = \
        $(AM_CFLAGS) \
-        -fvisibility=default \
+       -fvisibility=default \
        $(PYTHON_CFLAGS)
 
 _reader_la_LDFLAGS = \
@@ -3545,6 +3682,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
@@ -3554,8 +3692,7 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
 BUILT_SOURCES += \
        src/python-systemd/id128-constants.h
 
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
+SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
 sphinx-%:
        $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
        $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
@@ -3564,7 +3701,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
@@ -3606,7 +3743,8 @@ SED_PROCESS = \
                -e 's,@VERSION\@,$(VERSION),g' \
                -e 's,@rootprefix\@,$(rootprefix),g' \
                -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-               -e 's,@sushell\@,$(sushell),g' \
+               -e 's,@SUSHELL\@,$(SUSHELL),g' \
+               -e 's,@DEBUGTTY\@,$(DEBUGTTY),g' \
                -e 's,@KILL\@,$(KILL),g' \
                -e 's,@QUOTAON\@,$(QUOTAON),g' \
                -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
@@ -3718,6 +3856,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
 
@@ -3783,7 +3925,7 @@ SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup.service \
        systemd-sysctl.service \
        systemd-ask-password-console.path
-BASIC_TARGET_WANTS += \
+TIMERS_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
 
 if HAVE_SYSV_COMPAT
@@ -3805,9 +3947,12 @@ SYSTEM_UNIT_ALIASES += \
 USER_UNIT_ALIASES += \
        $(systemunitdir)/shutdown.target shutdown.target \
        $(systemunitdir)/sockets.target sockets.target \
+       $(systemunitdir)/timers.target timers.target \
+       $(systemunitdir)/paths.target paths.target \
        $(systemunitdir)/bluetooth.target bluetooth.target \
        $(systemunitdir)/printer.target printer.target \
-       $(systemunitdir)/sound.target sound.target
+       $(systemunitdir)/sound.target sound.target \
+       $(systemunitdir)/smartcard.target smartcard.target
 
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@ -3831,6 +3976,8 @@ INSTALL_DIRS += \
        $(sysconfdir)/modules-load.d \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
+       $(prefix)/lib/kernel/install.d \
+       $(sysconfdir)/kernel/install.d \
        $(systemshutdowndir) \
        $(systemsleepdir) \
        $(systemgeneratordir) \
@@ -3855,7 +4002,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) \
@@ -3886,7 +4033,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 )
 
Unnamed repository; edit this file 'description' to name the repository.