LIBUDEV_REVISION=4
LIBUDEV_AGE=6
-LIBSYSTEMD_CURRENT=8
+LIBSYSTEMD_CURRENT=9
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=8
+LIBSYSTEMD_AGE=9
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
nodist_udevrules_DATA =
dist_pkgsysconf_DATA =
nodist_pkgsysconf_DATA =
-dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
dist_systemunit_DATA_busnames =
shell-completion/bash/systemctl
dist_zshcompletion_DATA = \
+ shell-completion/zsh/_busctl \
shell-completion/zsh/_journalctl \
shell-completion/zsh/_udevadm \
shell-completion/zsh/_kernel-install \
dist_doc_DATA = \
README \
+ README.md \
NEWS \
+ CODING_STYLE \
LICENSE.LGPL2.1 \
LICENSE.GPL2 \
DISTRO_PORTING \
src/libsystemd/sd-bus/PORTING-DBUS1 \
src/libsystemd/sd-bus/DIFFERENCES \
- src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+ autogen.sh \
+ .dir-locals.el \
+ .vimrc \
+ .ycm_extra_conf.py \
+ .travis.yml \
+ .mailmap
@INTLTOOL_POLICY_RULE@
CLEANFILES += \
man/index.html
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
-update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES)
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
+update-man-list: $(top_srcdir)/tools/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
@echo "Makefile-man.am has been regenerated"
man/systemd.index.xml \
man/systemd.directives.xml
+EXTRA_DIST += \
+ tools/make-man-rules.py
+
endif
endif
EXTRA_DIST += \
- $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
- $(HTML_FILES) \
- $(HTML_ALIAS) \
- $(man_MANS) \
+ $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
tools/make-man-index.py \
tools/make-directive-index.py \
tools/xml_helper.py \
- man/systemd.index.xml \
- man/index.html \
- man/glib-event-glue.c \
- $(NULL)
+ man/glib-event-glue.c
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf \
tmpfiles.d/home.conf \
- tmpfiles.d/systemd-nspawn.conf
+ tmpfiles.d/systemd-nspawn.conf \
+ tmpfiles.d/journal-nocow.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
src/boot/efi/linux.c \
src/boot/efi/stub.c
-EXTRA_DIST += $(stub_sources) $(stub_headers)
+EXTRA_DIST += \
+ $(stub_sources) \
+ $(stub_headers) \
+ test/splash.bmp
if ENABLE_EFI
if HAVE_GNUEFI
systemd-modeset \
systemd-subterm
-dist_pkgdata_DATA += \
- src/libsystemd-terminal/unifont-glyph-array.bin
+pkgdata_DATA = \
+ src/libsystemd-terminal/unifont-glyph-array.bin
nodist_userunit_DATA += \
units/user/systemd-consoled.service
network/80-container-ve.network
dist_udevrules_DATA += \
- rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-block.rules \
rules/60-drm.rules \
rules/60-serial.rules \
rules/64-btrfs.rules \
rules/70-mouse.rules \
- rules/70-touchpad.rules \
rules/75-net-description.rules \
rules/78-sound-card.rules \
rules/80-net-setup-link.rules
hwdb/60-evdev.hwdb \
hwdb/60-keyboard.hwdb \
hwdb/70-mouse.hwdb \
- hwdb/70-pointingstick.hwdb \
- hwdb/70-touchpad.hwdb
+ hwdb/70-pointingstick.hwdb
SYSINIT_TARGET_WANTS += \
systemd-hwdb-update.service
# ------------------------------------------------------------------------------
TESTS += \
- test/udev-test.pl \
- $(NULL)
+ test/udev-test.pl
if HAVE_PYTHON
TESTS += \
- test/rule-syntax-check.py \
- $(NULL)
+ test/rule-syntax-check.py
if HAVE_SYSV_COMPAT
TESTS += \
- test/sysv-generator-test.py \
- $(NULL)
+ test/sysv-generator-test.py
endif
endif
test/udev-test.pl \
test/rule-syntax-check.py \
test/sysv-generator-test.py \
- test/mocks/fsck \
- $(NULL)
-
+ test/mocks/fsck
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
dist_udevrules_DATA += \
rules/60-persistent-v4l.rules
-# ------------------------------------------------------------------------------
-accelerometer_SOURCES = \
- src/udev/accelerometer/accelerometer.c
-
-accelerometer_LDADD = \
- libshared.la
-
-udevlibexec_PROGRAMS += \
- accelerometer
-
-dist_udevrules_DATA += \
- rules/61-accelerometer.rules
-
# ------------------------------------------------------------------------------
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
-chmod 755 $(DESTDIR)/var/log/journal/remote
INSTALL_EXEC_HOOKS += journal-remote-install-hook
-
endif
nodist_pkgsysconf_DATA += \
EXTRA_DIST += \
units/systemd-journal-remote.service.in \
- src/journal-remote/journal-remote.conf.in
-
+ src/journal-remote/journal-remote.conf.in \
+ src/journal-remote/log-generator.py
endif
if HAVE_LIBCURL
nodist_pkgsysconf_DATA += \
src/journal-remote/journal-upload.conf
-
endif
EXTRA_DIST += \
BUSNAMES_TARGET_WANTS += \
org.freedesktop.locale1.busname
-dist_pkgdata_DATA += \
+dist_pkgdata_DATA = \
src/locale/kbd-model-map \
src/locale/language-fallback-map
units/systemd-user-sessions.service.in
# ------------------------------------------------------------------------------
+EXTRA_DIST += \
+ test/Makefile \
+ test/README.testsuite \
+ test/TEST-01-BASIC \
+ test/TEST-01-BASIC/Makefile \
+ test/TEST-01-BASIC/test.sh \
+ test/TEST-02-CRYPTSETUP \
+ test/TEST-02-CRYPTSETUP/Makefile \
+ test/TEST-02-CRYPTSETUP/test.sh \
+ test/TEST-03-JOBS \
+ test/TEST-03-JOBS/Makefile \
+ test/TEST-03-JOBS/test-jobs.sh \
+ test/TEST-03-JOBS/test.sh \
+ test/test-functions
-if HAVE_PYTHON_DEVEL
-pkgpyexec_LTLIBRARIES = \
- _journal.la \
- id128.la \
- _daemon.la \
- _reader.la \
- login.la
-
-_journal_la_SOURCES = \
- src/python-systemd/_journal.c
-
-_journal_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-_journal_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_journal_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libsystemd.la
-
-id128_la_SOURCES = \
- src/python-systemd/id128.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-nodist_id128_la_SOURCES = \
- src/python-systemd/id128-constants.h
-
-id128_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS) \
- -I$(top_builddir)/src/python-systemd
-
-id128_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-id128_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.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_DEVEL_CFLAGS) \
- -I$(top_builddir)/src/python-systemd
-
-_daemon_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_daemon_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-_reader_la_SOURCES = \
- src/python-systemd/_reader.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-_reader_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-_reader_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_reader_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-login_la_SOURCES = \
- src/python-systemd/login.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-login_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-login_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-login_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-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
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
-
-BUILT_SOURCES += \
- $(nodist_id128_la_SOURCES)
-
-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/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
-
-python-shell:
- $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
- $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
-
-destdir-sphinx: all
- dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
- $(MAKE) DESTDIR="$$dir" install && \
- $(MAKE) DESTDIR="$$dir" sphinx-html && \
- rm -rf "$$dir"
-
-endif
-
-CLEAN_LOCAL_HOOKS += clean-sphinx
-
-.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
-
-clean-sphinx:
- -rm -rf docs/html/python-systemd/
-
-# Remove Python stuff, e.g. to force rebuilding for a different Python version.
-clean-python:
- -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
- -rm -f _daemon.la id128.la _journal.la login.la _reader.la
+EXTRA_DIST += \
+ test/loopy2.service \
+ test/loopy3.service \
+ test/loopy4.service \
+ test/loopy.service \
+ test/loopy.service.d \
+ test/loopy.service.d/compat.conf
# ------------------------------------------------------------------------------
if ENABLE_COMPAT_LIBS
libsystemd-id128.c \
libsystemd-daemon.c
+nodist_libsystemd_journal_la_SOURCES = \
+ libsystemd-journal.c
+
libsystemd_journal_la_SOURCES = \
- libsystemd-journal.c \
src/compat-libs/libsystemd-journal.sym
libsystemd_journal_la_CPPFLAGS = \
libsystemd-journal-internal.la \
libsystemd-internal.la
+nodist_libsystemd_login_la_SOURCES = \
+ libsystemd-login.c
+
libsystemd_login_la_SOURCES = \
- libsystemd-login.c \
src/compat-libs/libsystemd-login.sym
libsystemd_login_la_CPPFLAGS = \
libsystemd_login_la_LIBADD = \
libsystemd-internal.la
+nodist_libsystemd_id128_la_SOURCES = \
+ libsystemd-id128.c
+
libsystemd_id128_la_SOURCES = \
- libsystemd-id128.c \
src/compat-libs/libsystemd-id128.sym
libsystemd_id128_la_CPPFLAGS = \
libsystemd_id128_la_LIBADD = \
libsystemd-internal.la
+nodist_libsystemd_daemon_la_SOURCES = \
+ libsystemd-daemon.c
+
libsystemd_daemon_la_SOURCES = \
- libsystemd-daemon.c \
src/compat-libs/libsystemd-daemon.sym
libsystemd_daemon_la_CPPFLAGS = \
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
- '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
'|NTP_SERVERS=$(NTP_SERVERS)|' \
'|DNS_SERVERS=$(DNS_SERVERS)|' \
'|systemuidmax=$(SYSTEM_UID_MAX)|' \
--with-sysvrcnd-path=
endif
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
- --with-python
-endif
-
if ENABLE_SPLIT_USR
DISTCHECK_CONFIGURE_FLAGS += \
--enable-split-usr
.PHONY: git-tar
git-tar:
- git archive --format=tar --prefix=systemd-$(VERSION)/ v$(VERSION) | xz > systemd-$(VERSION).tar.xz
+ git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
-.PHONY: upload
-upload: all check dist
- scp systemd-$(VERSION).tar.xz $(www_target)
.PHONY: doc-sync
doc-sync: all destdir-sphinx
rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
.PHONY: gardel
gardel: upload
$(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
exported: $(addprefix exported-, $(lib_LTLIBRARIES))
- $(AM_V_GEN)cat $^ > $@
+ $(AM_V_GEN)sort -u $^ > $@
.PHONY: check-api-docs
check-api-docs: exported man
src/udev/udev.h
$(generate-sym-test)
-test_libsystemd_sym_SOURCES = \
+nodist_test_libsystemd_sym_SOURCES = \
test-libsystemd-sym.c
test_libsystemd_sym_LDADD = \
libsystemd.la
-test_libudev_sym_SOURCES = \
+nodist_test_libudev_sym_SOURCES = \
test-libudev-sym.c
test_libudev_sym_CFLAGS = \
$(AM_CFLAGS) \
libudev.la
BUILT_SOURCES += \
- $(test_libsystemd_sym_SOURCES) \
- $(test_libudev_sym_SOURCES)
+ test-libsystemd-sym.c \
+ test-libudev-sym.c
+
+CLEANFILES += \
+ test-libsystemd-sym.c \
+ test-libudev-sym.c
tests += \
test-libsystemd-sym \