kbdus: add null bloom filter to our messages

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5b319e2cbc6c83524503d5cd4e6332a842c5691..eee73e59509966aeb69b30f99cd2df102ed9b982 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
 .SECONDARY:
 
 LIBUDEV_CURRENT=4

-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2

 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 

-LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=4
+LIBSYSTEMD_LOGIN_CURRENT=5
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=5

 
 LIBSYSTEMD_DAEMON_CURRENT=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0

-LIBSYSTEMD_DAEMON_REVISION=8
+LIBSYSTEMD_DAEMON_REVISION=9

 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0

-LIBSYSTEMD_ID128_REVISION=19
+LIBSYSTEMD_ID128_REVISION=20

 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_ID128_AGE=0
 

-LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=8
+LIBSYSTEMD_JOURNAL_CURRENT=9
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=9

 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@


@@ -97,6 +97,7 @@ rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
 CLEANFILES = $(BUILT_SOURCES)
 rootlibexecdir=$(rootprefix)/lib/systemd
 
 CLEANFILES = $(BUILT_SOURCES)

+DISTCLEANFILES =

 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =


@@ -166,6 +167,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev \

+       -I $(top_srcdir)/src/libsystemd-bus \

        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)


@@ -220,7 +222,7 @@ define add-wants
          $(MKDIR_P) -m 0755 $$dir && \
          cd $$dir && \
          rm -f $$what && \
          $(MKDIR_P) -m 0755 $$dir && \
          cd $$dir && \
          rm -f $$what && \

-         for i in $$what; do ln -s ../$$i . || exit $$? ; done )
+         for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )

 endef
 
 install-directories-hook:
 endef
 
 install-directories-hook:


@@ -238,7 +240,7 @@ define install-aliases
        $(MKDIR_P) /$(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
                rm -f $(DESTDIR)$$dir/$$2 && \
        $(MKDIR_P) /$(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
                rm -f $(DESTDIR)$$dir/$$2 && \

-               ln -s $$1 $(DESTDIR)$$dir/$$2 && \
+               $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \

                shift 2 || exit $$?; \
        done
 endef
                shift 2 || exit $$?; \
        done
 endef


@@ -425,6 +427,7 @@ nodist_systemunit_DATA = \
        units/systemd-kexec.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
        units/systemd-kexec.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \

+       units/systemd-static-nodes.service \

        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \


@@ -466,6 +469,7 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \

+       units/systemd-static-nodes.service \

        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \


@@ -556,9 +560,10 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
 CLEANFILES += \
        man/index.html
 

+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)

 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))

+SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))

 
 

-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)

 update-man-list: make-man-rules.py $(XML_GLOB)
        $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
 update-man-list: make-man-rules.py $(XML_GLOB)
        $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am


@@ -566,11 +571,11 @@ update-man-list: make-man-rules.py $(XML_GLOB)
 
 man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
 
 man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)

-       $(AM_V_GEN)$(PYTHON) $^ > $@
+       $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)

 
 

-man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
+man/systemd.directives.xml: make-directive-index.py $(SOURCE_XML_FILES)

        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_at)$(MKDIR_P) $(dir $@)

-       $(AM_V_GEN)$(PYTHON) $^ > $@
+       $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)

 
 EXTRA_DIST += \
        man/systemd.index.xml \
 
 EXTRA_DIST += \
        man/systemd.index.xml \


@@ -591,7 +596,8 @@ EXTRA_DIST += \
        $(HTML_ALIAS) \
        $(dist_MANS) \
        make-man-index.py \
        $(HTML_ALIAS) \
        $(dist_MANS) \
        make-man-index.py \

-       make-directive-index.py
+       make-directive-index.py \
+       xml_helper.py

 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \


@@ -1083,7 +1089,9 @@ noinst_tests += \
        test-calendarspec \
        test-strip-tab-ansi \
        test-cgroup-util \
        test-calendarspec \
        test-strip-tab-ansi \
        test-cgroup-util \

-       test-prioq
+       test-prioq \
+       test-fileio \
+       test-time

 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \


@@ -1183,6 +1191,24 @@ test_prioq_CFLAGS = \
 test_prioq_LDADD = \
        libsystemd-core.la
 
 test_prioq_LDADD = \
        libsystemd-core.la
 

+test_fileio_SOURCES = \
+       src/test/test-fileio.c
+
+test_fileio_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_fileio_LDADD = \
+       libsystemd-core.la
+
+test_time_SOURCES = \
+       src/test/test-time.c
+
+test_time_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_time_LDADD = \
+       libsystemd-core.la
+

 test_log_SOURCES = \
        src/test/test-log.c
 
 test_log_SOURCES = \
        src/test/test-log.c
 


@@ -1608,7 +1634,9 @@ systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
        src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \

-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-daemon.la

 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \


@@ -1663,26 +1691,32 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \

+       src/systemd/sd-bus.h \
+       src/systemd/sd-bus-protocol.h \

        src/libsystemd-bus/sd-bus.c \
        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-control.c \

+       src/libsystemd-bus/bus-control.h \

        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-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-kernel.c \
+       src/libsystemd-bus/bus-kernel.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-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
+       src/libsystemd-bus/bus-type.h \
+       src/libsystemd-bus/bus-match.c \
+       src/libsystemd-bus/bus-match.h

 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \

-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-daemon.la

 
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
 noinst_LTLIBRARIES += \
        libsystemd-bus.la


@@ -1690,7 +1724,10 @@ noinst_LTLIBRARIES += \
 noinst_tests += \
        test-bus-marshal \
        test-bus-signature \
 noinst_tests += \
        test-bus-marshal \
        test-bus-signature \

-       test-bus-chat
+       test-bus-chat \
+       test-bus-server \
+       test-bus-match \
+       test-bus-kernel

 
 noinst_PROGRAMS += \
        busctl
 
 noinst_PROGRAMS += \
        busctl


@@ -1728,6 +1765,40 @@ test_bus_chat_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 

+test_bus_server_SOURCES = \
+       src/libsystemd-bus/test-bus-server.c
+
+test_bus_server_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+
+test_bus_server_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_match_SOURCES = \
+       src/libsystemd-bus/test-bus-match.c
+
+test_bus_match_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_match_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_kernel_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+

 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 


@@ -1870,11 +1941,13 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
        src/udev/udev.pc
 
 EXTRA_DIST += \

+       units/systemd-static-nodes.service.in \

        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \

+       units/systemd-static-nodes.service \

        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service


@@ -1883,6 +1956,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \

+       systemd-static-nodes.service \

        systemd-udevd.service \
        systemd-udev-trigger.service
 
        systemd-udevd.service \
        systemd-udev-trigger.service
 


@@ -2343,6 +2417,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \

+       keymaps/hewlett-packard_elitebook-8460p \

        keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
        keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \


@@ -2434,7 +2509,8 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \

-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la

 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)


@@ -2836,6 +2912,7 @@ systemd_journal_gatewayd_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon.la \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon.la \

+       libsystemd-bus.la \

        $(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
        $(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \


@@ -3495,7 +3572,6 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \

-       libsystemd-daemon.la \

        libsystemd-audit.la \
        libsystemd-dbus.la \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-dbus.la \
        libsystemd-shared.la \


@@ -3819,38 +3895,46 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES

+man/custom-entities.ent: Makefile
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
+        echo '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">,$(substitutions))))') \
+        > $@ # '
+
+DISTCLEANFILES += \
+       man/custom-entities.ent
+

 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi \
        --stringparam man.authors.section.enabled 0 \
        --stringparam man.copyright.section.enabled 0 \
 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi \
        --stringparam man.authors.section.enabled 0 \
        --stringparam man.copyright.section.enabled 0 \

-       --stringparam systemd.version $(VERSION)
+       --stringparam systemd.version $(VERSION) \
+       --path '$(builddir)/man:$(srcdir)/man'

 
 XSLTPROC_PROCESS_MAN = \
 
 XSLTPROC_PROCESS_MAN = \

-       $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
+       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<

 
 XSLTPROC_PROCESS_HTML = \
 
 XSLTPROC_PROCESS_HTML = \

-       $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<

 
 

-man/%.1: man/%.xml man/custom-man.xsl
+man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_MAN)
 
        $(XSLTPROC_PROCESS_MAN)
 

-man/%.3: man/%.xml man/custom-man.xsl
+man/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_MAN)
 
        $(XSLTPROC_PROCESS_MAN)
 

-man/%.5: man/%.xml man/custom-man.xsl
+man/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_MAN)
 
        $(XSLTPROC_PROCESS_MAN)
 

-man/%.7: man/%.xml man/custom-man.xsl
+man/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_MAN)
 
        $(XSLTPROC_PROCESS_MAN)
 

-man/%.8: man/%.xml man/custom-man.xsl
+man/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_MAN)
 
        $(XSLTPROC_PROCESS_MAN)
 

-man/%.html: man/%.xml man/custom-html.xsl
+man/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent

        $(XSLTPROC_PROCESS_HTML)
 
 define html-alias
        $(XSLTPROC_PROCESS_HTML)
 
 define html-alias


@@ -4040,6 +4124,10 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 

+kdbus-update:
+       ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+       wget -N https://d-bus.googlecode.com/git/kdbus.h )
+

 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/