chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: firmware - do not created /run/udev/firmware-missing/
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index fc7e8c429e8525281cbda51922e2150920da96e4..6e12a43ddf618545b1a821c4c8e8f37f41c72b36 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-64,7
+64,7
@@
pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=$(
sysconfdir)/bash_completion.d
+bashcompletiondir=$(
datadir)/bash-completion/completions
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@
-267,8
+267,7
@@
rootbin_PROGRAMS = \
systemd-ask-password \
systemd-tty-ask-password-agent \
systemd-tmpfiles \
systemd-ask-password \
systemd-tty-ask-password-agent \
systemd-tmpfiles \
- systemd-machine-id-setup \
- systemd-analyze
+ systemd-machine-id-setup
bin_PROGRAMS = \
systemd-cgls \
bin_PROGRAMS = \
systemd-cgls \
@@
-276,7
+275,14
@@
bin_PROGRAMS = \
systemd-stdio-bridge \
systemd-nspawn \
systemd-detect-virt \
systemd-stdio-bridge \
systemd-nspawn \
systemd-detect-virt \
- systemd-delta
+ systemd-delta \
+ systemd-analyze
+
+bin_SCRIPTS = \
+ src/kernel-install/kernel-install
+
+EXTRA_DIST += \
+ src/kernel-install/kernel-install
rootlibexec_PROGRAMS = \
systemd \
rootlibexec_PROGRAMS = \
systemd \
@@
-310,7
+316,10
@@
systemd_analyze_LDADD = \
libsystemd-dbus.la
dist_bashcompletion_DATA = \
libsystemd-dbus.la
dist_bashcompletion_DATA = \
- shell-completion/systemd-bash-completion.sh
+ shell-completion/bash/journalctl \
+ shell-completion/bash/systemctl \
+ shell-completion/bash/systemd-coredumpctl \
+ shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
@@
-373,7
+382,12
@@
dist_systemunit_DATA = \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
- units/system-update.target
+ 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
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-513,7
+527,7
@@
man/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))
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in
$(top_builddir)/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
@@
-849,6
+863,8
@@
libsystemd_core_la_SOURCES = \
src/core/tcpwrap.h \
src/core/cgroup-attr.c \
src/core/cgroup-attr.h \
src/core/tcpwrap.h \
src/core/cgroup-attr.c \
src/core/cgroup-attr.h \
+ src/core/cgroup-semantics.c \
+ src/core/cgroup-semantics.h \
src/core/securebits.h \
src/core/initreq.h \
src/core/special.h \
src/core/securebits.h \
src/core/initreq.h \
src/core/special.h \
@@
-1560,7
+1576,6
@@
libsystemd_daemon_la_CFLAGS = \
libsystemd_daemon_la_LDFLAGS = \
$(AM_LDFLAGS) \
libsystemd_daemon_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -shared \
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
@@
-2261,7
+2276,6
@@
libsystemd_id128_la_CFLAGS = \
libsystemd_id128_la_LDFLAGS = \
$(AM_LDFLAGS) \
libsystemd_id128_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -shared \
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
-version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
@@
-2307,6
+2321,18
@@
EXTRA_DIST += \
src/libsystemd-id128/libsystemd-id128.pc.in \
src/libsystemd-id128/libsystemd-id128.sym
src/libsystemd-id128/libsystemd-id128.pc.in \
src/libsystemd-id128/libsystemd-id128.sym
+# ------------------------------------------------------------------------------
+
+rootlibexec_PROGRAMS += \
+ systemd-activate
+
+systemd_activate_SOURCES = \
+ src/activate/activate.c
+
+systemd_activate_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-daemon.la
+
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
@@
-2452,7
+2478,6
@@
libsystemd_journal_la_CFLAGS = \
libsystemd_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
libsystemd_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -shared \
-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
-version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
@@
-2554,6
+2579,8
@@
libsystemd-journal-uninstall-hook:
INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
+# ------------------------------------------------------------------------------
+
# Update catalog on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
catalog-update-hook:
# Update catalog on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
catalog-update-hook:
@@
-2948,6
+2975,9
@@
hostnamectl_LDADD = \
bin_PROGRAMS += \
hostnamectl
bin_PROGRAMS += \
hostnamectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/hostnamectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3021,6
+3051,9
@@
localectl_LDADD = \
bin_PROGRAMS += \
localectl
bin_PROGRAMS += \
localectl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/localectl
+
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3087,6
+3120,9
@@
timedatectl_LDADD = \
bin_PROGRAMS += \
timedatectl
bin_PROGRAMS += \
timedatectl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/timedatectl
endif
polkitpolicy_in_files += \
endif
polkitpolicy_in_files += \
@@
-3209,6
+3245,9
@@
loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
rootbin_PROGRAMS += \
loginctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/loginctl
+
systemd_inhibit_SOURCES = \
src/login/inhibit.c
systemd_inhibit_SOURCES = \
src/login/inhibit.c
@@
-3254,7
+3293,6
@@
libsystemd_login_la_CFLAGS = \
libsystemd_login_la_LDFLAGS = \
$(AM_LDFLAGS) \
libsystemd_login_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -shared \
-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
-version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
@@
-3404,7
+3442,9
@@
_journal_la_LIBADD = \
id128_la_SOURCES = \
src/python-systemd/id128.c \
id128_la_SOURCES = \
src/python-systemd/id128.c \
- src/python-systemd/id128-constants.h
+ src/python-systemd/id128-constants.h \
+ src/python-systemd/pyutil.c \
+ src/python-systemd/pyutil.h
id128_la_CFLAGS = \
$(AM_CFLAGS) \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-3423,7
+3463,9
@@
id128_la_LIBADD = \
libsystemd-id128.la
_reader_la_SOURCES = \
libsystemd-id128.la
_reader_la_SOURCES = \
- src/python-systemd/_reader.c
+ src/python-systemd/_reader.c \
+ src/python-systemd/pyutil.c \
+ src/python-systemd/pyutil.h
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-3439,7
+3481,8
@@
_reader_la_LDFLAGS = \
_reader_la_LIBADD = \
$(PYTHON_LIBS) \
libsystemd-journal.la \
_reader_la_LIBADD = \
$(PYTHON_LIBS) \
libsystemd-journal.la \
- libsystemd-id128.la
+ libsystemd-id128.la \
+ libsystemd-shared.la
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
@@
-3447,19
+3490,24
@@
dist_pkgpyexec_PYTHON = \
src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
$(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)
;
/p' <$< >$@
+ $(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 += \
src/python-systemd/id128-constants.h
endif
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
endif
-if ENABLE_SPHINX
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
- $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/man/python-systemd/
+ $(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_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
-endif
+
+destdir-sphinx: all
+ dir="`mktemp -d /tmp/systemd-install.XXXXXX`" && \
+ $(MAKE) DESTDIR="$$dir" install && \
+ $(MAKE) DESTDIR="$$dir" sphinx-html && \
+ rm -rf "$$dir"
# ------------------------------------------------------------------------------
SED_PROCESS = \
# ------------------------------------------------------------------------------
SED_PROCESS = \
@@
-3781,17
+3829,19
@@
upload: all distcheck
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
-doc-sync: all
+www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
+doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/libudev/html --online
gtkdoc-rebase --html-dir=docs/libudev/html --online
- rsync -av --delete docs/libudev/html/ --omit-dir-times
www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
/libudev/
+ rsync -av --delete docs/libudev/html/ --omit-dir-times
$(www_target)
/libudev/
gtkdoc-rebase --html-dir=docs/gudev/html --online
gtkdoc-rebase --html-dir=docs/gudev/html --online
- rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
- rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+ 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/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
install-tree: all
rm -rf $(abs_srcdir)/install-tree
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
install-tree: all
rm -rf $(abs_srcdir)/install-tree
-
make
install DESTDIR=$(abs_srcdir)/install-tree
+
$(MAKE)
install DESTDIR=$(abs_srcdir)/install-tree
tree $(abs_srcdir)/install-tree
tree $(abs_srcdir)/install-tree