X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5692077b34ca0d7d56bec39d75e507cf888999b6;hp=6daf960a83e2bd728b1fa312fcbf6b81f48bc75a;hb=9bdbc2e2ec523dbefe1c1c7e164b5544aff0b185;hpb=24fdc2300451372bd098a7cab39f3a417d46605b diff --git a/Makefile.am b/Makefile.am index 6daf960a8..5692077b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- */ +# -*- Mode: makefile; indent-tabs-mode: t -*- # # This file is part of systemd. # @@ -28,27 +28,27 @@ SUBDIRS = . po .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 @@ -63,7 +63,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions 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 @@ -168,7 +168,7 @@ AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ -define move-to-rootlibdir = +define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ @@ -259,7 +259,6 @@ dist_systemunit_DATA = \ 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 \ @@ -377,24 +376,22 @@ EXTRA_DIST += \ 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 \ @@ -587,6 +584,11 @@ man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8 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 @@ -679,23 +681,12 @@ CLEANFILES += \ ${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 \ @@ -711,13 +702,19 @@ XML_DIRECTIVE_FILES = \ 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 @@ -764,6 +761,8 @@ libsystemd_shared_la_SOURCES = \ 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 \ @@ -804,7 +803,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-dst.c \ src/shared/time-dst.h \ src/shared/calendarspec.c \ - src/shared/calendarspec.h + src/shared/calendarspec.h \ + src/shared/output-mode.h libsystemd_shared_la_LIBADD = libsystemd-daemon.la @@ -3013,6 +3013,25 @@ EXTRA_DIST += \ 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 += \ @@ -3549,6 +3568,27 @@ pamlib_LTLIBRARIES = \ 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: libname=libsystemd-login.so && $(move-to-rootlibdir) @@ -3645,6 +3685,7 @@ MANPAGES_ALIAS += \ 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 \ @@ -3669,6 +3710,7 @@ man/sd_session_get_state.3: man/sd_session_is_active.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 @@ -3897,16 +3939,16 @@ docs/sysvinit/README: docs/sysvinit/README.in 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 @@ -4060,11 +4102,14 @@ DISTCHECK_CONFIGURE_FLAGS = \ --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