X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a74a8068f44ac4b6b522e682bdc3a2982ed5f2db;hp=4e3b3605939428c35cace7012e13502a89f039ed;hb=56d4fbf92eb6d8eb31c910e137224308c40dd909;hpb=b694b00b450673f4bc2d47aebeb0c091e66d1b25 diff --git a/Makefile.am b/Makefile.am index 4e3b36059..a74a8068f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,8 +23,11 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po +# remove targets if the command fails +.DELETE_ON_ERROR: + LIBUDEV_CURRENT=1 -LIBUDEV_REVISION=2 +LIBUDEV_REVISION=3 LIBUDEV_AGE=0 LIBGUDEV_CURRENT=1 @@ -32,20 +35,20 @@ LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_REVISION=1 LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=2 +LIBSYSTEMD_DAEMON_REVISION=3 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=6 +LIBSYSTEMD_ID128_REVISION=7 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=2 +LIBSYSTEMD_JOURNAL_CURRENT=3 LIBSYSTEMD_JOURNAL_REVISION=0 -LIBSYSTEMD_JOURNAL_AGE=2 +LIBSYSTEMD_JOURNAL_AGE=3 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -79,7 +82,7 @@ rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd -CLEANFILES = +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = @@ -452,6 +455,7 @@ MANPAGES = \ man/systemd.device.5 \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ + man/systemd.kill.5 \ man/systemd.special.7 \ man/systemd.journal-fields.7 \ man/kernel-command-line.7 \ @@ -534,6 +538,7 @@ MANPAGES_ALIAS = \ man/systemd-poweroff.service.8 \ man/systemd-reboot.service.8 \ man/systemd-kexec.service.8 \ + man/systemd-fsck.8 \ man/systemd-fsck-root.service.8 \ man/systemd-ask-password-console.path.8 \ man/systemd-ask-password-wall.service.8 \ @@ -600,6 +605,7 @@ man/systemd-shutdown.8: man/systemd-halt.service.8 man/systemd-poweroff.service.8: man/systemd-halt.service.8 man/systemd-reboot.service.8: man/systemd-halt.service.8 man/systemd-kexec.service.8: man/systemd-halt.service.8 +man/systemd-fsck.8: man/systemd-fsck@.service.8 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8 @@ -669,9 +675,12 @@ noinst_DATA += \ CLEANFILES += \ man/index.html -man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py +man/index.html: make-man-index.py $(XML_FILES) $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@ + $(PYTHON) $^ > $@ + +EXTRA_DIST += \ + man/index.html endif endif @@ -898,6 +907,8 @@ libsystemd_core_la_SOURCES = \ src/core/load-dropin.h \ src/core/execute.c \ src/core/execute.h \ + src/core/kill.c \ + src/core/kill.h \ src/core/dbus.c \ src/core/dbus.h \ src/core/dbus-manager.c \ @@ -926,6 +937,8 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-device.h \ src/core/dbus-execute.c \ src/core/dbus-execute.h \ + src/core/dbus-kill.c \ + src/core/dbus-kill.h \ src/core/dbus-path.c \ src/core/dbus-path.h \ src/core/cgroup.c \ @@ -998,7 +1011,7 @@ libsystemd_core_la_LIBADD = \ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@ + $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ EXTRA_DIST += \ src/core/load-fragment-gperf.gperf.m4 @@ -1008,25 +1021,23 @@ CLEANFILES += \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c \ src/core/syscall-list.txt \ - src/core/syscall-from-name.gperf \ - src/core/syscall-from-name.h \ - src/core/syscall-to-name.h + src/core/syscall-from-name.gperf BUILT_SOURCES += \ src/core/syscall-from-name.h \ src/core/syscall-to-name.h src/core/syscall-list.txt: Makefile - $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ || rm $@ + $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ || rm $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile - $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ || rm $@ + $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ || rm $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ # ------------------------------------------------------------------------------ systemd_SOURCES = \ @@ -1464,7 +1475,8 @@ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-shared.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1649,7 +1661,13 @@ MANPAGES += \ man/systemd-udevd.service.8 MANPAGES_ALIAS += \ - man/systemd-udevd.8 + man/systemd-udevd.8 \ + man/systemd-udevd-control.socket.8 \ + man/systemd-udevd-kernel.socket.8 + +man/systemd-udevd.8: man/systemd-udevd.service.8 +man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 +man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 udev-confdirs: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d @@ -1993,9 +2011,6 @@ EXTRA_DIST += \ src/gudev/seed-example-enum.js \ src/gudev/seed-example.js -CLEANFILES += \ - $(nodist_libgudev_1_0_la_SOURCES) - src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ @@ -2116,7 +2131,6 @@ EXTRA_DIST += \ src/udev/keymap/keyboard-force-release.sh.in CLEANFILES += \ - $(nodist_keymap_SOURCES) \ src/udev/keymap/keys.txt \ src/udev/keymap/keys-from-name.gperf \ src/udev/keymap/keyboard-force-release.sh @@ -2193,16 +2207,16 @@ dist_udevkeymapforcerel_DATA = \ src/udev/keymap/keys.txt: Makefile $(AM_V_at)mkdir -p src/udev/keymap - $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ || rm $@ + $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ || rm $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile - $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ || rm $@ + $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ || rm $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ endif # ------------------------------------------------------------------------------ @@ -2968,6 +2982,9 @@ dbusinterface_DATA += \ org.freedesktop.timedate1.xml timedated-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(prefix)/lib/ntp-units.d \ + $(DESTDIR)$(sysconfdir)/ntp-units.d ( cd $(DESTDIR)$(systemunitdir) && \ rm -f dbus-org.freedesktop.timedate1.service && \ $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service ) @@ -3238,7 +3255,6 @@ MANPAGES += \ man/systemd-user-sessions.service.8 MANPAGES_ALIAS += \ - man/systemd-logind.8 \ man/sd_login_monitor_unref.3 \ man/sd_login_monitor_flush.3 \ man/sd_login_monitor_get_fd.3 \ @@ -3246,6 +3262,7 @@ MANPAGES_ALIAS += \ man/sd_session_get_uid.3 \ man/sd_session_get_seat.3 \ man/sd_session_get_service.3 \ + man/sd_session_get_state.3 \ man/sd_session_get_type.3 \ man/sd_session_get_class.3 \ man/sd_session_get_display.3 \ @@ -3258,6 +3275,7 @@ MANPAGES_ALIAS += \ man/sd_seat_can_multi_session.3 \ man/sd_get_sessions.3 \ man/sd_get_uids.3 \ + man/systemd-logind.8 \ man/systemd-user-sessions.8 man/systemd-logind.8: man/systemd-logind.service.8 @@ -3268,6 +3286,7 @@ man/sd_login_monitor.3: man/sd_login_monitor_new.3 man/sd_session_get_uid.3: man/sd_session_is_active.3 man/sd_session_get_seat.3: man/sd_session_is_active.3 man/sd_session_get_service.3: man/sd_session_is_active.3 +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 @@ -3321,7 +3340,7 @@ SED_PROCESS = \ -e 's,@rootprefix\@,$(rootprefix),g' \ -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ -e 's,@sushell\@,$(sushell),g' \ - < $< > $@ || rm $@ + < $< > $@ units/%: units/%.in Makefile $(SED_PROCESS) @@ -3354,15 +3373,15 @@ src/%.c: src/%.gperf src/%: src/%.m4 $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) < $< > $@ M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ M4_PROCESS_USER = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) @@ -3418,7 +3437,7 @@ man/%.7: man/%.xml man/%.8: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.html: man/%.xml +man/%.html: man/%.xml man/custom-html.xsl $(XSLTPROC_PROCESS_HTML) CLEANFILES += \