comment out uncommitted test source code

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be97193b456d8a4f7dedae5709a00cb28fdfdcbf..82659274c954344303732f4bc9f01f3cbfcf963a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=5
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=4
+LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=9
+LIBSYSTEMD_ID128_REVISION=11
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=4
+LIBSYSTEMD_JOURNAL_CURRENT=5
 LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=4
+LIBSYSTEMD_JOURNAL_AGE=5
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -469,7 +471,7 @@ MANPAGES = \
        man/systemd.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
-       man/timezone.5 \
+       man/localtime.5 \
        man/machine-id.5 \
        man/locale.conf.5 \
        man/os-release.5 \
@@ -682,8 +684,36 @@ man/index.html: make-man-index.py $(XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 
+MANPAGES += \
+       man/systemd.directives.5
+
 EXTRA_DIST += \
        man/index.html
+
+XML_DIRECTIVE_FILES = \
+       man/systemd.unit.xml \
+       man/systemd.service.xml \
+       man/systemd.socket.xml \
+       man/systemd.mount.xml \
+       man/systemd.automount.xml \
+       man/systemd.swap.xml \
+       man/systemd.target.xml \
+       man/systemd.path.xml \
+       man/systemd.timer.xml \
+       man/systemd.snapshot.xml \
+       man/systemd.exec.xml \
+       man/systemd.kill.xml \
+       man/systemd.device.xml \
+       man/systemd.conf.xml \
+       man/systemd.journal-fields.xml
+
+man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+       man/systemd.directives.xml
+
 endif
 
 endif
@@ -693,7 +723,8 @@ EXTRA_DIST += \
        ${XML_FILES:.xml=.html} \
        $(MANPAGES) \
        $(MANPAGES_ALIAS) \
-       make-man-index.py
+       make-man-index.py \
+       make-directive-index.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -878,6 +909,8 @@ noinst_LTLIBRARIES += \
 libsystemd_core_la_SOURCES = \
        src/core/unit.c \
        src/core/unit.h \
+       src/core/unit-printf.c \
+       src/core/unit-printf.h \
        src/core/job.c \
        src/core/job.h \
        src/core/manager.c \
@@ -946,6 +979,8 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-path.h \
        src/core/cgroup.c \
        src/core/cgroup.h \
+       src/core/selinux-access.c \
+       src/core/selinux-access.h \
        src/core/selinux-setup.c \
        src/core/selinux-setup.h \
        src/core/ima-setup.c \
@@ -1005,6 +1040,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
+       libsystemd-audit.la \
        libsystemd-id128-internal.la \
        libudev.la \
        $(LIBWRAP_LIBS) \
@@ -1706,6 +1742,7 @@ dist_udevrules_DATA += \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
        rules/60-persistent-storage.rules \
+       rules/64-btrfs.rules \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
@@ -1766,6 +1803,7 @@ libudev_core_la_SOURCES = \
        src/udev/udev-ctrl.c \
        src/udev/udev-builtin.c \
        src/udev/udev-builtin-blkid.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 \
@@ -2435,6 +2473,13 @@ test_journal_verify_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_mmap_cache_SOURCES = \
+       src/journal/test-mmap-cache.c
+
+test_mmap_cache_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
@@ -2540,12 +2585,14 @@ noinst_PROGRAMS += \
        test-journal-match \
        test-journal-stream \
        test-journal-verify
+#      test-mmap-cache
 
 TESTS += \
        test-journal \
        test-journal-match \
        test-journal-stream \
        test-journal-verify
+#      test-mmap-cache
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -3314,8 +3361,7 @@ systemd_multi_seat_x_SOURCES = \
 
 systemd_multi_seat_x_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libudev.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
@@ -3450,6 +3496,8 @@ SED_PROCESS = \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
                -e 's,@userunitdir\@,$(userunitdir),g' \
+               -e 's,@systempresetdir\@,$(systempresetdir),g' \
+               -e 's,@userpresetdir\@,$(userpresetdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \