chiark / gitweb /
systemctl: append .service to unit names lacking suffix
[elogind.git] / Makefile.am
index a7a1db7c052c52eb4a22ca28f0eab8f2ea88643f..a74a8068f44ac4b6b522e682bdc3a2982ed5f2db 100644 (file)
@@ -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 =
@@ -141,6 +144,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd \
+       -I $(top_builddir)/src/core \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev
@@ -451,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 \
@@ -498,10 +503,19 @@ MANPAGES = \
        man/sd-id128.3 \
        man/sd_id128_to_string.3 \
        man/sd_id128_randomize.3 \
+       man/sd_id128_get_machine.3 \
        man/sd-journal.3 \
        man/sd_journal_print.3 \
        man/sd_journal_stream_fd.3 \
-       man/sd_journal_open.3
+       man/sd_journal_open.3 \
+       man/sd_journal_next.3 \
+       man/sd_journal_get_data.3 \
+       man/sd_journal_get_realtime_usec.3 \
+       man/sd_journal_get_cutoff_realtime_usec.3 \
+       man/sd_journal_get_cursor.3 \
+       man/sd_journal_get_fd.3 \
+       man/sd_journal_add_match.3 \
+       man/sd_journal_seek_head.3
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -524,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 \
@@ -537,13 +552,38 @@ MANPAGES_ALIAS = \
        man/SD_ID128_FORMAT_VAL.3 \
        man/sd_id128_equal.3 \
        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/SD_JOURNAL_SUPPRESS_LOCATION.3 \
        man/sd_journal_open_directory.3 \
-       man/sd_journal_close.3
+       man/sd_journal_close.3 \
+       man/sd_journal.3 \
+       man/SD_JOURNAL_RUNTIME_ONLY.3 \
+       man/SD_JOURNAL_SYSTEM_ONLY.3 \
+       man/SD_JOURNAL_LOCAL_ONLY.3 \
+       man/sd_journal_previous.3 \
+       man/sd_journal_next_skip.3 \
+       man/sd_journal_previous_skip.3 \
+       man/SD_JOURNAL_FOREACH.3 \
+       man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
+       man/sd_journal_enumerate_data.3 \
+       man/sd_journal_restart_data.3 \
+       man/SD_JOURNAL_FOREACH_DATA.3 \
+       man/sd_journal_get_monotonic_usec.3 \
+       man/sd_journal_get_cutoff_monotonic_usec.3 \
+       man/sd_journal_process.3 \
+       man/sd_journal_wait.3 \
+       man/SD_JOURNAL_NOP.3 \
+       man/SD_JOURNAL_APPEND.3 \
+       man/SD_JOURNAL_INVALIDATE.3 \
+       man/sd_journal_add_disjunction.3 \
+       man/sd_journal_flush_matches.3 \
+       man/sd_journal_seek_tail.3 \
+       man/sd_journal_seek_monotonic_usec.3 \
+       man/sd_journal_seek_realtime_usec.3 \
+       man/sd_journal_seek_cursor.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -565,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
@@ -578,13 +619,38 @@ man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
 man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
 man/sd_id128_equal.3: man/sd-id128.3
 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_id128_get_boot.3: man/sd_id128_get_machine.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
+man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
 man/sd_journal_open_directory.3: man/sd_journal_open.3
 man/sd_journal_close.3: man/sd_journal_open.3
+man/sd_journal.3: man/sd_journal_open.3
+man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
+man/sd_journal_previous.3: man/sd_journal_next.3
+man/sd_journal_next_skip.3: man/sd_journal_next.3
+man/sd_journal_previous_skip.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
+man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
+man/sd_journal_restart_data.3: man/sd_journal_get_data.3
+man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
+man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
+man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
+man/sd_journal_process.3: man/sd_journal_get_fd.3
+man/sd_journal_wait.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
+man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
+man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -596,13 +662,35 @@ man_MANS = \
 
 noinst_DATA = \
        ${XML_FILES:.xml=.html}
+
+CLEANFILES += \
+       $(MANPAGES) \
+       $(MANPAGES_ALIAS) \
+       ${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_GEN)$(MKDIR_P) $(dir $@) && \
+       $(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+       man/index.html
+endif
+
 endif
 
 EXTRA_DIST += \
        $(XML_FILES) \
        ${XML_FILES:.xml=.html} \
        $(MANPAGES) \
-       $(MANPAGES_ALIAS)
+       $(MANPAGES_ALIAS) \
+       make-man-index.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -611,6 +699,8 @@ noinst_LTLIBRARIES += \
 libsystemd_shared_la_SOURCES = \
        src/shared/linux/auto_dev-ioctl.h \
        src/shared/linux/fanotify.h \
+       src/shared/linux/seccomp.h \
+       src/shared/linux/seccomp-bpf.h \
        src/shared/missing.h \
        src/shared/list.h \
        src/shared/macro.h \
@@ -817,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 \
@@ -845,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 \
@@ -884,11 +978,15 @@ libsystemd_core_la_SOURCES = \
        src/core/switch-root.h \
        src/core/switch-root.c \
        src/core/killall.h \
-       src/core/killall.c
+       src/core/killall.c \
+       src/core/syscall-list.c \
+       src/core/syscall-list.h
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
-       src/core/load-fragment-gperf-nulstr.c
+       src/core/load-fragment-gperf-nulstr.c \
+       src/core/syscall-from-name.h \
+       src/core/syscall-to-name.h
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -913,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
@@ -921,7 +1019,25 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/core/load-fragment-gperf.gperf \
        src/core/load-fragment-gperf.c \
-       src/core/load-fragment-gperf-nulstr.c
+       src/core/load-fragment-gperf-nulstr.c \
+       src/core/syscall-list.txt \
+       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; }' > $@
+
+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 }' < $< > $@
+
+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 < $< > $@
+
+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 "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
@@ -1359,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 = \
@@ -1431,13 +1548,31 @@ MANPAGES_ALIAS += \
        man/sd_is_socket_unix.3 \
        man/sd_is_socket_inet.3 \
        man/sd_is_mq.3 \
-       man/sd_notifyf.3
+       man/sd_notifyf.3 \
+       man/SD_LISTEN_FDS_START.3 \
+       man/SD_EMERG.3 \
+       man/SD_ALERT.3 \
+       man/SD_CRIT.3 \
+       man/SD_ERR.3 \
+       man/SD_WARNING.3 \
+       man/SD_NOTICE.3 \
+       man/SD_INFO.3 \
+       man/SD_DEBUG.3
 
 man/sd_is_socket.3: man/sd_is_fifo.3
 man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
+man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
+man/SD_EMERG.3: man/sd-daemon.3
+man/SD_ALERT.3: man/sd-daemon.3
+man/SD_CRIT.3: man/sd-daemon.3
+man/SD_ERR.3: man/sd-daemon.3
+man/SD_WARNING.3: man/sd-daemon.3
+man/SD_NOTICE.3: man/sd-daemon.3
+man/SD_INFO.3: man/sd-daemon.3
+man/SD_DEBUG.3: man/sd-daemon.3
 
 EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.pc.in \
@@ -1526,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
@@ -1675,22 +1816,10 @@ test_libudev_LDADD = \
        libudev.la
 
 test_udev_SOURCES = \
-       src/test/test-udev.c \
-       $(libudev_core_la_SOURCES) \
-       $(libudev_private_la_SOURCES)
-
-# The test-udev program needs everything compiled with relative path
-# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
-test_udev_CFLAGS = \
-       -DTEST_PREFIX=\"test\" \
-       $(libudev_core_la_CFLAGS) \
-       $(libudev_private_la_CFLAGS)
-
-test_udev_CPPFLAGS =\
-       $(libudev_core_la_CPPFLAGS)
+       src/test/test-udev.c
 
 test_udev_LDADD = \
-       libsystemd-label.la \
+       libudev-core.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
@@ -1882,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 > $@
 
@@ -2005,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
@@ -2080,11 +2205,11 @@ dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/samsung-90x3a \
        keymaps-force-release/common-volume-keys
 
-src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+src/udev/keymap/keys.txt: Makefile
        $(AM_V_at)mkdir -p src/udev/keymap
-       $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+       $(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
+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 }' < $< > $@
 
 src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
@@ -2344,7 +2469,7 @@ noinst_PROGRAMS += \
        test-journal-stream
 
 TESTS += \
-       test-journal
+       test-journal \
        test-journal-match \
        test-journal-stream
 
@@ -2529,7 +2654,8 @@ systemd_readahead_LDADD = \
        libsystemd-daemon.la \
        libudev.la
 
-pkginclude_HEADERS += \
+dist_doc_DATA += \
+       src/readahead/sd-readahead.c \
        src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
@@ -2856,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 )
@@ -3126,13 +3255,14 @@ 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 \
+       man/sd_login_monitor.3 \
        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 \
@@ -3145,15 +3275,18 @@ 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
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
+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
@@ -3207,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)
@@ -3240,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)
@@ -3276,7 +3409,10 @@ if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
-       --stringparam funcsynopsis.style ansi
+       --stringparam funcsynopsis.style ansi \
+       --stringparam man.th.extra1.suppress 1 \
+       --stringparam man.authors.section.enabled 0 \
+       --stringparam man.copyright.section.enabled 0
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -3301,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 += \