-# -*- Mode: makefile; indent-tabs-mode: t -*- */
+# -*- Mode: makefile; indent-tabs-mode: t -*-
#
# This file is part of systemd.
#
.DELETE_ON_ERROR:
LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=2
+LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=10
+LIBSYSTEMD_LOGIN_REVISION=11
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=6
+LIBSYSTEMD_DAEMON_REVISION=7
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=16
+LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=7
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
LIBSYSTEMD_JOURNAL_AGE=7
# Dirs of external packages
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
-sysvrcddir=$(SYSTEM_SYSVRCND_PATH)
+sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
varlogdir=$(localstatedir)/log
systemdstatedir=$(localstatedir)/lib/systemd
catalogstatedir=$(systemdstatedir)/catalog
AM_CFLAGS = $(OUR_CFLAGS)
AM_LDFLAGS = $(OUR_LDFLAGS)
+# ------------------------------------------------------------------------------
+
+define move-to-rootlibdir
+ if test "$(libdir)" != "$(rootlibdir)"; then \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
+ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+ mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
+ fi
+endef
+
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
systemd-detect-virt \
systemd-delta
-dist_bin_SCRIPTS = \
- src/analyze/systemd-analyze
-
rootlibexec_PROGRAMS = \
systemd \
systemd-cgroups-agent \
systemd-fstab-generator \
systemd-system-update-generator
+dist_bin_SCRIPTS = \
+ src/analyze/systemd-analyze
+
+EXTRA_DIST += \
+ src/analyze/systemd-analyze.in
+
+CLEANFILES += \
+ src/analyze/systemd-analyze
+
dist_bashcompletion_DATA = \
shell-completion/systemd-bash-completion.sh
units/network.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
- units/mail-transfer-agent.target \
units/hibernate.target \
units/hybrid-sleep.target \
units/poweroff.target \
introspect.awk \
man/custom-html.xsl
-if HAVE_KMOD
EXTRA_DIST += \
units/systemd-modules-load.service.in
-endif
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
units/halt-local.service
-EXTRA_DIST += \
- units/rc-local.service.in \
- units/halt-local.service.in
-
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
+EXTRA_DIST += \
+ units/rc-local.service.in \
+ units/halt-local.service.in
+
dist_doc_DATA = \
README \
NEWS \
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
endif
+if HAVE_MYHOSTNAME
+MANPAGES += \
+ man/nss-myhostname.8
+endif
+
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
${XML_FILES:.xml=.html}
if HAVE_PYTHON
-noinst_DATA += \
- man/index.html
-
-CLEANFILES += \
- man/index.html
-
-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
+ man/systemd.index.7 \
+ man/systemd.directives.7
XML_DIRECTIVE_FILES = \
+ man/systemd.xml \
man/systemd.unit.xml \
man/systemd.service.xml \
man/systemd.socket.xml \
man/systemd.device.xml \
man/systemd.conf.xml \
man/systemd.journal-fields.xml \
- man/systemd.time.xml
+ man/systemd.time.xml \
+ man/bootchart.conf.xml
+
+man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(PYTHON) $^ > $@
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.index.xml \
man/systemd.directives.xml
endif
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strbuf.h \
+ src/shared/strxcpyx.c \
+ src/shared/strxcpyx.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-daemon-install-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
- mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
- fi
-
-INSTALL_EXEC_HOOKS += \
- libsystemd-daemon-install-hook
+ libname=libsystemd-daemon.so && $(move-to-rootlibdir)
libsystemd-daemon-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-UNINSTALL_EXEC_HOOKS += \
- libsystemd-daemon-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
lib_LTLIBRARIES += \
libsystemd-daemon.la
src/libudev/libudev.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libudev-install-move-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
- mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \
- fi
+libudev-install-hook:
+ libname=libudev.so && $(move-to-rootlibdir)
-libudev-uninstall-move-hook:
+libudev-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
-INSTALL_EXEC_HOOKS += libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libudev-install-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
+ rules/80-net-name-slot.rules \
rules/95-udev-late.rules
if HAVE_KMOD
endif # HAVE_INTROSPECTION
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-move-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
- mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlibdir); \
- fi
+libgudev-install-hook:
+ libname=libgudev-1.0.so && $(move-to-rootlibdir)
-libgudev-uninstall-move-hook:
+libgudev-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-INSTALL_EXEC_HOOKS += libgudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libgudev-install-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
endif
EXTRA_DIST += \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
- mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
- fi
-
-INSTALL_EXEC_HOOKS += \
- libsystemd-id128-install-hook
+ libname=libsystemd-id128.so && $(move-to-rootlibdir)
libsystemd-id128-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
-UNINSTALL_EXEC_HOOKS += \
- libsystemd-id128-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook
EXTRA_DIST += \
src/libsystemd-id128/libsystemd-id128.pc.in \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
- mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
- fi
-
-INSTALL_EXEC_HOOKS += \
- libsystemd-journal-install-hook
+ libname=libsystemd-journal.so && $(move-to-rootlibdir)
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-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.
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in
+# ------------------------------------------------------------------------------
+if ENABLE_BOOTCHART
+systemd_bootchart_SOURCES = \
+ src/bootchart/bootchart.c \
+ src/bootchart/bootchart.h \
+ src/bootchart/log.c \
+ src/bootchart/svg.c
+
+MANPAGES += \
+ man/systemd-bootchart.1 \
+ man/bootchart.conf.5
+
+rootlibexec_PROGRAMS += \
+ systemd-bootchart
+
+dist_pkgsysconf_DATA += \
+ src/bootchart/bootchart.conf
+endif
+
# ------------------------------------------------------------------------------
if ENABLE_QUOTACHECK
rootlibexec_PROGRAMS += \
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
-update-kbd-model-map:
- src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+update-kbd-model-map: src/locale/generate-kbd-model-map
+ $PYTHON $< > src/locale/kbd-model-map
localectl_SOURCES = \
src/locale/localectl.c
pam_systemd.la
endif
+if HAVE_MYHOSTNAME
+libnss_myhostname_la_SOURCES = \
+ src/nss-myhostname/nss-myhostname.c \
+ src/nss-myhostname/ifconf.h \
+ src/nss-myhostname/netlink.c
+
+libnss_myhostname_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libnss_myhostname_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -module \
+ -export-dynamic \
+ -avoid-version \
+ -shared \
+ -shrext .so.2
+
+lib_LTLIBRARIES += \
+ libnss_myhostname.la
+endif
+
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-login-install-hook:
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
- mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
- fi
-
-INSTALL_EXEC_HOOKS += \
- libsystemd-login-install-hook
+ libname=libsystemd-login.so && $(move-to-rootlibdir)
libsystemd-login-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
-UNINSTALL_EXEC_HOOKS += \
- libsystemd-login-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-login-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook
nodist_systemunit_DATA += \
units/systemd-logind.service \
man/sd_session_get_type.3 \
man/sd_session_get_class.3 \
man/sd_session_get_display.3 \
+ man/sd_session_get_tty.3 \
man/sd_pid_get_owner_uid.3 \
man/sd_pid_get_unit.3 \
man/sd_uid_is_on_seat.3 \
man/sd_session_get_type.3: man/sd_session_is_active.3
man/sd_session_get_class.3: man/sd_session_is_active.3
man/sd_session_get_display.3: man/sd_session_is_active.3
+man/sd_session_get_tty.3: man/sd_session_is_active.3
man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
man/sd_pid_get_unit.3: man/sd_pid_get_session.3
man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-e 's,@VARLOGDIR\@,$(varlogdir),g' \
-e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
-e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
+ -e 's,@PYTHON\@,$(PYTHON),g' \
+ -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \
< $< > $@
units/%: units/%.in Makefile
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
+src/analyze/systemd-analyze: %: %.in Makefile
+ $(SED_PROCESS)
+ $(AM_V_GEN)chmod +x $@
+
src/%.c: src/%.gperf
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(GPERF) < $< > $@
docs/var-log/README: docs/var-log/README.in
$(SED_PROCESS)
-EXTRA_DIST += \
- docs/sysvinit/README.in \
- docs/var-log/README.in
-
CLEANFILES += \
docs/sysvinit/README \
docs/var-log/README
endif
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+ docs/var-log/README.in
+
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
--with-rootprefix=$$dc_install_base \
--disable-split-usr
-
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
- --with-sysvrcnd-path=$$dc_install_base/$(sysvrcddir)
+ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path=
endif
if ENABLE_GTK_DOC
endif
hwdb-update:
- ( cd hwdb && \
- wget -N http://www.linux-usb.org/usb.ids && \
- wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
- wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
- wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+ ( cd $(top_srcdir)/hwdb && \
+ wget -N http://www.linux-usb.org/usb.ids \
+ http://pci-ids.ucw.cz/v2.2/pci.ids \
+ http://standards.ieee.org/develop/regauth/oui/oui.txt \
+ http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
upload: all distcheck
~ianmdlvl / elogind.git / blobdiff