chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: fix distcheck
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 13211c45bdfe2582c1db8f50ba17f7cf30b9e9ac..d85eb702c640755a6d68d3a4145d1e659bbefa91 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,16
+32,16
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=3
.SECONDARY:
LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
3
-LIBSYSTEMD_LOGIN_REVISION=
11
-LIBSYSTEMD_LOGIN_AGE=
3
+LIBSYSTEMD_LOGIN_CURRENT=
4
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
4
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
@@
-51,9
+51,9
@@
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
7
-LIBSYSTEMD_JOURNAL_REVISION=
1
-LIBSYSTEMD_JOURNAL_AGE=
7
+LIBSYSTEMD_JOURNAL_CURRENT=
8
+LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_AGE=
8
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-342,8
+342,6
@@
dist_systemunit_DATA = \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
- units/initrd-fs.target \
- units/initrd-fs-pre.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
@@
-384,11
+382,7
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-parse-etc.service \
- units/initrd-cleanup.service \
- units/initrd-switch-root.target \
- units/initrd-udevadm-cleanup-db.service \
- units/initrd-switch-root.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-420,7
+414,11
@@
nodist_systemunit_DATA = \
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 \
- units/debug-shell.service
+ units/debug-shell.service \
+ units/initrd-parse-etc.service \
+ units/initrd-cleanup.service \
+ units/initrd-udevadm-cleanup-db.service \
+ units/initrd-switch-root.service
dist_userunit_DATA = \
units/user/default.target \
dist_userunit_DATA = \
units/user/default.target \
@@
-462,6
+460,10
@@
EXTRA_DIST += \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
+ units/initrd-parse-etc.service.in \
+ 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 \
man/custom-html.xsl
@@
-524,7
+526,7
@@
CLEANFILES += \
man/index.html
man/index.html:
man/index.html
man/index.html:
- $(AM_V_GEN)$(LN_S) systemd.index.html $@
+ $(AM_V_GEN)$(LN_S)
-f
systemd.index.html $@
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
@@
-844,6
+846,8
@@
libsystemd_core_la_SOURCES = \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
+ src/core/smack-setup.c \
+ src/core/smack-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
@@
-2568,7
+2572,7
@@
endif
# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
- $(MKDIR_P) $(DESTDIR)/var/log/journal
+
-
$(MKDIR_P) $(DESTDIR)/var/log/journal
-chown 0:0 $(DESTDIR)/var/log/journal
-chmod 755 $(DESTDIR)/var/log/journal
-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-chown 0:0 $(DESTDIR)/var/log/journal
-chmod 755 $(DESTDIR)/var/log/journal
-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
@@
-3513,11
+3517,11
@@
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
SPHINXOPTS = -D latex_paper_size=$(PAPER)
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)/
man
/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
man
/python-systemd/
+ $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/
docs
/python-systemd/
+ $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
docs
/python-systemd/
destdir-sphinx: all
destdir-sphinx: all
- dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
+ dir="$
$
(mktemp -d /tmp/systemd-install.XXXXXX)" && \
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
@@
-3850,7
+3854,7
@@
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -av --delete --omit-dir-times
man/python-systemd/ $(www_target)/man
/python-systemd/
+ rsync -av --delete --omit-dir-times
docs/python-systemd/ $(www_target)
/python-systemd/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"