X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=70b8b091e1e2d3305a0bfed76837f93c3a7cebeb;hb=94163dd54328780b4539e7296eb0ba75b7290367;hp=5789a139a93eab8bcaf39006436045945e8d5cff;hpb=cc2600642aeba372b57a303ecfa942e29c35fef1;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5789a139a..70b8b091e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,28 +24,28 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po LIBUDEV_CURRENT=1 -LIBUDEV_REVISION=1 +LIBUDEV_REVISION=2 LIBUDEV_AGE=0 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=2 -LIBSYSTEMD_LOGIN_REVISION=4 -LIBSYSTEMD_LOGIN_AGE=2 +LIBSYSTEMD_LOGIN_CURRENT=3 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=2 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=5 +LIBSYSTEMD_ID128_REVISION=6 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=1 -LIBSYSTEMD_JOURNAL_REVISION=1 -LIBSYSTEMD_JOURNAL_AGE=1 +LIBSYSTEMD_JOURNAL_CURRENT=2 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=2 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -96,6 +96,7 @@ dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = dist_pkgsysconf_DATA = +dist_pkgdata_DATA = dist_dbuspolicy_DATA = dbusinterface_DATA = dist_dbussystemservice_DATA = @@ -172,12 +173,6 @@ AM_CPPFLAGS += \ -DKBD_SETFONT=\"/bin/setfont\" \ -DDEFAULT_FONT=\"LatArCyrHeb-16\" else -if TARGET_MEEGO -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" -else if TARGET_ANGSTROM AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -200,7 +195,6 @@ endif endif endif endif -endif # ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ @@ -307,9 +301,8 @@ dist_systemunit_DATA = \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/syslog.target \ - units/systemd-udev-control.socket \ - units/systemd-udev-kernel.socket \ - units/systemd-timedated-ntp.target \ + units/systemd-udevd-control.socket \ + units/systemd-udevd-kernel.socket \ units/system-update.target nodist_systemunit_DATA = \ @@ -339,10 +332,10 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service + units/debug-shell.service dist_userunit_DATA = \ units/user/default.target \ @@ -377,10 +370,10 @@ EXTRA_DIST += \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ units/user@.service.in \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service.in \ + units/debug-shell.service.in \ units/systemd-hibernate.service.in \ units/systemd-suspend.service.in \ introspect.awk \ @@ -501,7 +494,12 @@ MANPAGES = \ man/systemd-getty-generator.8 \ man/systemd-system-update-generator.8 \ man/systemd-fstab-generator.8 \ - man/systemd.preset.5 + man/systemd.preset.5 \ + man/sd-id128.7 \ + man/sd_id128_to_string.3 \ + man/sd_id128_randomize.3 \ + man/sd-journal.7 \ + man/sd_journal_print.3 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -530,7 +528,18 @@ MANPAGES_ALIAS = \ man/systemd-ask-password-wall.path.8 \ man/systemd-tmpfiles-setup.service.8 \ man/systemd-tmpfiles-clean.service.8 \ - man/systemd-tmpfiles-clean.timer.8 + man/systemd-tmpfiles-clean.timer.8 \ + man/sd_id128_t.7 \ + man/SD_ID128_MAKE.7 \ + man/SD_ID128_FORMAT_STR.7 \ + man/SD_ID128_FORMAT_VAL.7 \ + man/sd_id128_equal.7 \ + man/sd_id128_from_string.3 \ + man/sd_id128_get_machine.3 \ + man/sd_id128_get_boot.3 \ + man/sd_journal_printv.3 \ + man/sd_journal_send.3 \ + man/sd_journal_sendv.3 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 @@ -559,6 +568,17 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8 man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8 man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8 +man/sd_id128_t.7: man/sd-id128.7 +man/SD_ID128_MAKE.7: man/sd-id128.7 +man/SD_ID128_FORMAT_STR.7: man/sd-id128.7 +man/SD_ID128_FORMAT_VAL.7: man/sd-id128.7 +man/sd_id128_equal.7: man/sd-id128.7 +man/sd_id128_from_string.3: man/sd_id128_to_string.3 +man/sd_id128_get_machine.3: man/sd_id128_randomize.3 +man/sd_id128_get_boot.3: man/sd_id128_randomize.3 +man/sd_journal_printv.3: man/sd_journal_print.3 +man/sd_journal_send.3: man/sd_journal_print.3 +man/sd_journal_sendv.3: man/sd_journal_print.3 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -1491,7 +1511,7 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ - man/systemd-udev.service.8 + man/systemd-udevd.service.8 MANPAGES_ALIAS += \ man/systemd-udevd.8 @@ -1533,21 +1553,21 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ - units/systemd-udev.service.in \ + units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ units/systemd-udev-settle.service.in CLEANFILES += \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service systemd-install-hook: mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants - ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket - ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket + ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket + ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants - ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service + ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service INSTALL_DATA_HOOKS += systemd-install-hook @@ -2745,7 +2765,7 @@ man/systemd-localed.8: man/systemd-localed.service.8 EXTRA_DIST += \ units/systemd-localed.service.in -dist_pkgdata_DATA = \ +dist_pkgdata_DATA += \ src/locale/kbd-model-map dist_noinst_SCRIPT = \ @@ -3369,20 +3389,6 @@ systemd-install-data-hook: ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) -if TARGET_MEEGO - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ - rm -f network.target && \ - $(LN_S) $(systemunitdir)/network.target network.target ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \ - rm -f * ) -endif if TARGET_FEDORA ( cd $(DESTDIR)$(systemunitdir) && \