update TODO

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1cfbf40f550250d79a2220650addcf474970fad7..70b8b091e1e2d3305a0bfed76837f93c3a7cebeb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,7 +133,6 @@ AM_CPPFLAGS = \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-       -DSYSTEMD_NTP_UNITS=\"$(pkgdatadir)/ntp-units\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -174,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\" \
@@ -202,7 +195,6 @@ endif
 endif
 endif
 endif
-endif
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -502,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 \
@@ -531,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
@@ -560,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)}}}}}
@@ -2802,9 +2821,6 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
        timedated-install-data-hook
 
-dist_pkgdata_DATA += \
-       src/timedate/ntp-units
-
 MANPAGES += \
        man/systemd-timedated.service.8
 
@@ -3373,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) && \