diff --git a/Makefile.am b/Makefile.am index 85f7ed605..886598d1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ ul_libuuid_incdir = $(top_srcdir)/libuuid/src bashcompletiondir = @bashcompletiondir@ dist_noinst_HEADERS = +dist_noinst_DATA = noinst_PROGRAMS = EXTRA_LTLIBRARIES = usrbin_exec_PROGRAMS = @@ -58,15 +59,15 @@ check_PROGRAMS = dist_check_SCRIPTS = PATHFILES = +ADOCFILES_COMMON = +MANPAGES = +MANLINKS = INSTALL_EXEC_HOOKS = UNINSTALL_HOOKS = INSTALL_DATA_HOOKS = CLEAN_LOCALS = CHECK_LOCALS = -MANPAGES = -MANLINKS = -MANPAGES_EXTRA = EXTRA_DIST = CLEANFILES = @@ -113,7 +114,6 @@ include man-common/Makemodule.am include tests/Makemodule.am - # pylibmountexec module must be installed after usrlib_exec libraries, # otherwise the libtool relink step will fail to find libmount.la and # will try -lmount which is possibly not available. @@ -196,12 +196,12 @@ $(PATHFILES): Makefile CLEANFILES += $(MANPAGES) $(MANLINKS) -EXTRA_DIST += $(MANPAGES:=.adoc) $(MANPAGES_EXTRA) +EXTRA_DIST += $(ADOCFILES_COMMON) if ENABLE_ASCIIDOC man_MANS += $(MANPAGES) $(MANLINKS) -$(MANPAGES): $(MANPAGES_EXTRA) Makefile +$(MANPAGES): $(ADOCFILES_COMMON) Makefile asciidoc_man_cmd = $(ASCIIDOCTOR) \ -b manpage \ diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 9e99b1380..2124612ab 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -2,6 +2,7 @@ if BUILD_MINIX sbin_PROGRAMS += fsck.minix MANPAGES += disk-utils/fsck.minix.8 +dist_noinst_DATA += disk-utils/fsck.minix.8.adoc fsck_minix_SOURCES = \ disk-utils/fsck.minix.c \ disk-utils/minix_programs.h \ @@ -10,6 +11,7 @@ fsck_minix_LDADD = $(LDADD) libcommon.la sbin_PROGRAMS += mkfs.minix MANPAGES += disk-utils/mkfs.minix.8 +dist_noinst_DATA += disk-utils/mkfs.minix.8.adoc mkfs_minix_SOURCES = \ disk-utils/minix_programs.h \ disk-utils/mkfs.minix.c \ @@ -26,6 +28,7 @@ endif if BUILD_MKFS sbin_PROGRAMS += mkfs MANPAGES += disk-utils/mkfs.8 +dist_noinst_DATA += disk-utils/mkfs.8.adoc mkfs_SOURCES = disk-utils/mkfs.c endif @@ -33,6 +36,7 @@ endif if BUILD_ISOSIZE usrbin_exec_PROGRAMS += isosize MANPAGES += disk-utils/isosize.8 +dist_noinst_DATA += disk-utils/isosize.8.adoc isosize_SOURCES = disk-utils/isosize.c isosize_LDADD = $(LDADD) libcommon.la endif @@ -41,6 +45,7 @@ endif if BUILD_BFS sbin_PROGRAMS += mkfs.bfs MANPAGES += disk-utils/mkfs.bfs.8 +dist_noinst_DATA += disk-utils/mkfs.bfs.8.adoc mkfs_bfs_SOURCES = \ disk-utils/mkfs.bfs.c mkfs_bfs_LDADD = $(LDADD) libcommon.la @@ -50,6 +55,7 @@ endif if BUILD_MKSWAP sbin_PROGRAMS += mkswap MANPAGES += disk-utils/mkswap.8 +dist_noinst_DATA += disk-utils/mkswap.8.adoc mkswap_SOURCES = \ disk-utils/mkswap.c \ lib/ismounted.c @@ -76,6 +82,7 @@ endif # BUILD_MKSWAP if BUILD_SWAPLABEL sbin_PROGRAMS += swaplabel MANPAGES += disk-utils/swaplabel.8 +dist_noinst_DATA += disk-utils/swaplabel.8.adoc swaplabel_SOURCES = \ disk-utils/swaplabel.c \ lib/swapprober.c \ @@ -94,6 +101,7 @@ endif #BUILD_SWAPLABEL if BUILD_FSCK sbin_PROGRAMS += fsck MANPAGES += disk-utils/fsck.8 +dist_noinst_DATA += disk-utils/fsck.8.adoc fsck_SOURCES = disk-utils/fsck.c lib/monotonic.c fsck_LDADD = $(LDADD) libmount.la libblkid.la libcommon.la $(REALTIME_LIBS) fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir) @@ -103,6 +111,7 @@ endif if BUILD_RAW sbin_PROGRAMS += raw MANPAGES += disk-utils/raw.8 +dist_noinst_DATA += disk-utils/raw.8.adoc raw_SOURCES = disk-utils/raw.c endif @@ -111,11 +120,13 @@ if BUILD_CRAMFS cramfs_common_sources = disk-utils/cramfs.h disk-utils/cramfs_common.c sbin_PROGRAMS += fsck.cramfs MANPAGES += disk-utils/fsck.cramfs.8 +dist_noinst_DATA += disk-utils/fsck.cramfs.8.adoc fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources) fsck_cramfs_LDADD = $(LDADD) -lz libcommon.la sbin_PROGRAMS += mkfs.cramfs MANPAGES += disk-utils/mkfs.cramfs.8 +dist_noinst_DATA += disk-utils/mkfs.cramfs.8.adoc mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources) mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la endif @@ -123,6 +134,7 @@ endif if BUILD_FDFORMAT usrsbin_exec_PROGRAMS += fdformat MANPAGES += disk-utils/fdformat.8 +dist_noinst_DATA += disk-utils/fdformat.8.adoc fdformat_SOURCES = disk-utils/fdformat.c fdformat_LDADD = $(LDADD) libcommon.la endif @@ -130,6 +142,7 @@ endif if BUILD_BLOCKDEV sbin_PROGRAMS += blockdev MANPAGES += disk-utils/blockdev.8 +dist_noinst_DATA += disk-utils/blockdev.8.adoc blockdev_SOURCES = disk-utils/blockdev.c blockdev_LDADD = $(LDADD) libcommon.la endif @@ -138,6 +151,7 @@ endif if BUILD_FDISK sbin_PROGRAMS += fdisk MANPAGES += disk-utils/fdisk.8 +dist_noinst_DATA += disk-utils/fdisk.8.adoc fdisk_SOURCES = \ disk-utils/fdisk.c \ disk-utils/fdisk.h \ @@ -162,6 +176,7 @@ endif # BUILD_FDISK if BUILD_SFDISK sbin_PROGRAMS += sfdisk MANPAGES += disk-utils/sfdisk.8 +dist_noinst_DATA += disk-utils/sfdisk.8.adoc sfdisk_SOURCES = \ disk-utils/sfdisk.c \ disk-utils/fdisk-list.c \ @@ -184,6 +199,7 @@ endif # BUILD_SFDISK if BUILD_CFDISK sbin_PROGRAMS += cfdisk MANPAGES += disk-utils/cfdisk.8 +dist_noinst_DATA += disk-utils/cfdisk.8.adoc cfdisk_SOURCES = disk-utils/cfdisk.c cfdisk_LDADD = \ $(LDADD) \ @@ -217,7 +233,11 @@ MANPAGES += \ disk-utils/delpart.8 \ disk-utils/resizepart.8 \ disk-utils/partx.8 - +dist_noinst_DATA += \ + disk-utils/addpart.8.adoc \ + disk-utils/delpart.8.adoc \ + disk-utils/resizepart.8.adoc \ + disk-utils/partx.8.adoc addpart_SOURCES = disk-utils/addpart.c addpart_LDADD = $(LDADD) libcommon.la diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 4c6cc074c..5d95b37ea 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -76,7 +76,7 @@ endif endif # !HAVE_TINFO MANPAGES += lib/terminal-colors.d.5 - +dist_noinst_DATA += lib/terminal-colors.d.5.adoc check_PROGRAMS += \ test_blkdev \ diff --git a/libblkid/Makemodule.am b/libblkid/Makemodule.am index 33c73595e..19ed31f96 100644 --- a/libblkid/Makemodule.am +++ b/libblkid/Makemodule.am @@ -9,8 +9,11 @@ SUBDIRS += libblkid/docs endif pkgconfig_DATA += libblkid/blkid.pc -PATHFILES += libblkid/blkid.pc -MANPAGES += libblkid/libblkid.3 +PATHFILES += libblkid/blkid.pc + +MANPAGES += libblkid/libblkid.3 +dist_noinst_DATA += libblkid/libblkid.3.adoc + EXTRA_DIST += libblkid/COPYING endif # BUILD_LIBBLKID diff --git a/libuuid/man/Makemodule.am b/libuuid/man/Makemodule.am index c373fe9bd..1cdc1b09a 100644 --- a/libuuid/man/Makemodule.am +++ b/libuuid/man/Makemodule.am @@ -10,6 +10,17 @@ MANPAGES += \ libuuid/man/uuid_time.3 \ libuuid/man/uuid_unparse.3 +dist_noinst_DATA += \ + libuuid/man/uuid.3.adoc \ + libuuid/man/uuid_clear.3.adoc \ + libuuid/man/uuid_compare.3.adoc \ + libuuid/man/uuid_copy.3.adoc \ + libuuid/man/uuid_generate.3.adoc \ + libuuid/man/uuid_is_null.3.adoc \ + libuuid/man/uuid_parse.3.adoc \ + libuuid/man/uuid_time.3.adoc \ + libuuid/man/uuid_unparse.3.adoc + MANLINKS += \ libuuid/man/uuid_generate_random.3 \ libuuid/man/uuid_generate_time.3 \ diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 64fac0138..75c0a6756 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -2,6 +2,7 @@ if BUILD_LAST usrbin_exec_PROGRAMS += last MANPAGES += login-utils/last.1 +dist_noinst_DATA += login-utils/last.1.adoc MANLINKS += login-utils/lastb.1 last_SOURCES = login-utils/last.c lib/monotonic.c last_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS) @@ -28,6 +29,7 @@ endif if BUILD_SULOGIN sbin_PROGRAMS += sulogin MANPAGES += login-utils/sulogin.8 +dist_noinst_DATA += login-utils/sulogin.8.adoc sulogin_SOURCES = \ login-utils/sulogin.c \ login-utils/sulogin-consoles.c \ @@ -54,6 +56,7 @@ endif # BUILD_SULOGIN if BUILD_LOGIN bin_PROGRAMS += login MANPAGES += login-utils/login.1 +dist_noinst_DATA += login-utils/login.1.adoc login_SOURCES = \ login-utils/login.c \ login-utils/logindefs.c \ @@ -77,6 +80,7 @@ endif # BUILD_LOGIN if BUILD_NOLOGIN sbin_PROGRAMS += nologin MANPAGES += login-utils/nologin.8 +dist_noinst_DATA += login-utils/nologin.8.adoc nologin_SOURCES = login-utils/nologin.c nologin_LDADD = $(LDADD) libcommon.la endif @@ -85,6 +89,7 @@ endif if BUILD_UTMPDUMP usrbin_exec_PROGRAMS += utmpdump MANPAGES += login-utils/utmpdump.1 +dist_noinst_DATA += login-utils/utmpdump.1.adoc utmpdump_SOURCES = login-utils/utmpdump.c utmpdump_LDADD = $(LDADD) libcommon.la endif @@ -95,6 +100,9 @@ usrbin_exec_PROGRAMS += chfn chsh MANPAGES += \ login-utils/chfn.1 \ login-utils/chsh.1 +dist_noinst_DATA += \ + login-utils/chfn.1.adoc \ + login-utils/chsh.1.adoc chfn_chsh_sources = \ login-utils/ch-common.h \ @@ -156,6 +164,7 @@ endif # BUILD_CHFN_CHSH if BUILD_SU bin_PROGRAMS += su MANPAGES += login-utils/su.1 +dist_noinst_DATA += login-utils/su.1.adoc su_SOURCES = \ login-utils/su.c \ login-utils/su-common.c \ @@ -183,6 +192,7 @@ endif # BUILD_SU if BUILD_RUNUSER sbin_PROGRAMS += runuser MANPAGES += login-utils/runuser.1 +dist_noinst_DATA += login-utils/runuser.1.adoc runuser_SOURCES = \ login-utils/runuser.c \ login-utils/su-common.c \ @@ -208,6 +218,7 @@ endif # BUILD_RUNUSER if BUILD_NEWGRP usrbin_exec_PROGRAMS += newgrp MANPAGES += login-utils/newgrp.1 +dist_noinst_DATA += login-utils/newgrp.1.adoc newgrp_SOURCES = login-utils/newgrp.c newgrp_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) newgrp_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) @@ -217,9 +228,11 @@ newgrp_LDADD += -lcrypt endif endif # BUILD_NEWGRP + if BUILD_LSLOGINS usrbin_exec_PROGRAMS += lslogins MANPAGES += login-utils/lslogins.1 +dist_noinst_DATA += login-utils/lslogins.1.adoc lslogins_SOURCES = \ login-utils/lslogins.c \ login-utils/logindefs.c \ @@ -238,9 +251,11 @@ lslogins_LDADD += -leconf endif endif # BUILD_LSLOGINS + if BUILD_VIPW usrsbin_exec_PROGRAMS += vipw MANPAGES += login-utils/vipw.8 +dist_noinst_DATA += login-utils/vipw.8.adoc MANLINKS += login-utils/vigr.8 vipw_SOURCES = \ login-utils/vipw.c \ diff --git a/man-common/Makemodule.am b/man-common/Makemodule.am index 9ff08cb86..01edd0f5f 100644 --- a/man-common/Makemodule.am +++ b/man-common/Makemodule.am @@ -1,4 +1,4 @@ -MANPAGES_EXTRA += \ +ADOCFILES_COMMON += \ man-common/bugreports.adoc \ man-common/footer.adoc \ man-common/footer-config.adoc \ diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index b10b75b54..9c93a8b93 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -1,6 +1,7 @@ if BUILD_CAL usrbin_exec_PROGRAMS += cal MANPAGES += misc-utils/cal.1 +dist_noinst_DATA += misc-utils/cal.1.adoc cal_SOURCES = misc-utils/cal.c cal_CFLAGS = $(AM_CFLAGS) cal_LDADD = $(LDADD) libcommon.la libtcolors.la @@ -25,6 +26,7 @@ endif # BUILD_CAL if BUILD_LOGGER usrbin_exec_PROGRAMS += logger MANPAGES += misc-utils/logger.1 +dist_noinst_DATA += misc-utils/logger.1.adoc logger_SOURCES = misc-utils/logger.c lib/strutils.c lib/strv.c logger_LDADD = $(LDADD) logger_CFLAGS = $(AM_CFLAGS) @@ -43,12 +45,14 @@ endif # BUILD_LOGGER if BUILD_LOOK usrbin_exec_PROGRAMS += look MANPAGES += misc-utils/look.1 +dist_noinst_DATA += misc-utils/look.1.adoc look_SOURCES = misc-utils/look.c endif if BUILD_MCOOKIE usrbin_exec_PROGRAMS += mcookie MANPAGES += misc-utils/mcookie.1 +dist_noinst_DATA += misc-utils/mcookie.1.adoc mcookie_SOURCES = misc-utils/mcookie.c lib/md5.c mcookie_LDADD = $(LDADD) libcommon.la endif @@ -56,12 +60,14 @@ endif if BUILD_NAMEI usrbin_exec_PROGRAMS += namei MANPAGES += misc-utils/namei.1 +dist_noinst_DATA += misc-utils/namei.1.adoc namei_SOURCES = misc-utils/namei.c lib/strutils.c lib/idcache.c endif if BUILD_WHEREIS usrbin_exec_PROGRAMS += whereis MANPAGES += misc-utils/whereis.1 +dist_noinst_DATA += misc-utils/whereis.1.adoc whereis_SOURCES = misc-utils/whereis.c whereis_LDADD = $(LDADD) libcommon.la endif @@ -69,6 +75,7 @@ endif if BUILD_LSLOCKS usrbin_exec_PROGRAMS += lslocks MANPAGES += misc-utils/lslocks.8 +dist_noinst_DATA += misc-utils/lslocks.8.adoc lslocks_LDADD = $(LDADD) libcommon.la libmount.la libsmartcols.la lslocks_SOURCES = misc-utils/lslocks.c lslocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir) @@ -77,6 +84,7 @@ endif if BUILD_LSBLK bin_PROGRAMS += lsblk MANPAGES += misc-utils/lsblk.8 +dist_noinst_DATA += misc-utils/lsblk.8.adoc lsblk_SOURCES = \ misc-utils/lsblk.c \ misc-utils/lsblk-mnt.c \ @@ -93,6 +101,7 @@ endif # BUILD_LSBLK if BUILD_UUIDGEN usrbin_exec_PROGRAMS += uuidgen MANPAGES += misc-utils/uuidgen.1 +dist_noinst_DATA += misc-utils/uuidgen.1.adoc uuidgen_SOURCES = misc-utils/uuidgen.c uuidgen_LDADD = $(LDADD) libuuid.la uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) @@ -101,6 +110,7 @@ endif if BUILD_UUIDPARSE usrbin_exec_PROGRAMS += uuidparse MANPAGES += misc-utils/uuidparse.1 +dist_noinst_DATA += misc-utils/uuidparse.1.adoc uuidparse_SOURCES = misc-utils/uuidparse.c uuidparse_LDADD = $(LDADD) libcommon.la libuuid.la libsmartcols.la uuidparse_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) -I$(ul_libsmartcols_incdir) @@ -109,6 +119,7 @@ endif if BUILD_UUIDD usrsbin_exec_PROGRAMS += uuidd MANPAGES += misc-utils/uuidd.8 +dist_noinst_DATA += misc-utils/uuidd.8.adoc uuidd_LDADD = $(LDADD) libuuid.la libcommon.la $(REALTIME_LIBS) uuidd_CFLAGS = $(DAEMON_CFLAGS) $(AM_CFLAGS) -I$(ul_libuuid_incdir) uuidd_LDFLAGS = $(DAEMON_LDFLAGS) $(AM_LDFLAGS) @@ -135,6 +146,7 @@ PATHFILES += \ if BUILD_BLKID sbin_PROGRAMS += blkid MANPAGES += misc-utils/blkid.8 +dist_noinst_DATA += misc-utils/blkid.8.adoc blkid_SOURCES = misc-utils/blkid.c \ lib/ismounted.c blkid_LDADD = $(LDADD) libblkid.la libcommon.la @@ -153,6 +165,7 @@ endif # BUILD_BLKID if BUILD_FINDFS sbin_PROGRAMS += findfs MANPAGES += misc-utils/findfs.8 +dist_noinst_DATA += misc-utils/findfs.8.adoc findfs_LDADD = $(LDADD) libblkid.la findfs_SOURCES = misc-utils/findfs.c findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) @@ -161,6 +174,7 @@ endif if BUILD_WIPEFS sbin_PROGRAMS += wipefs MANPAGES += misc-utils/wipefs.8 +dist_noinst_DATA += misc-utils/wipefs.8.adoc wipefs_SOURCES = misc-utils/wipefs.c wipefs_LDADD = $(LDADD) libblkid.la libcommon.la libsmartcols.la wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir) @@ -169,6 +183,7 @@ endif if BUILD_FINDMNT bin_PROGRAMS += findmnt MANPAGES += misc-utils/findmnt.8 +dist_noinst_DATA += misc-utils/findmnt.8.adoc findmnt_LDADD = $(LDADD) libmount.la \ libcommon.la \ libsmartcols.la \ @@ -189,6 +204,7 @@ endif # BUILD_FINDMNT if BUILD_KILL bin_PROGRAMS += kill MANPAGES += misc-utils/kill.1 +dist_noinst_DATA += misc-utils/kill.1.adoc kill_SOURCES = misc-utils/kill.c kill_LDADD = $(LDADD) libcommon.la endif @@ -196,12 +212,14 @@ endif if BUILD_RENAME usrbin_exec_PROGRAMS += rename MANPAGES += misc-utils/rename.1 +dist_noinst_DATA += misc-utils/rename.1.adoc rename_SOURCES = misc-utils/rename.c endif if BUILD_GETOPT usrbin_exec_PROGRAMS += getopt MANPAGES += misc-utils/getopt.1 +dist_noinst_DATA += misc-utils/getopt.1.adoc getopt_SOURCES = misc-utils/getopt.c getopt_LDADD = $(LDADD) libcommon.la getoptexampledir = $(docdir) @@ -213,6 +231,7 @@ endif if BUILD_FINCORE usrbin_exec_PROGRAMS += fincore MANPAGES += misc-utils/fincore.1 +dist_noinst_DATA += misc-utils/fincore.1.adoc fincore_SOURCES = misc-utils/fincore.c fincore_LDADD = $(LDADD) libsmartcols.la libcommon.la fincore_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -221,6 +240,7 @@ endif if BUILD_HARDLINK usrbin_exec_PROGRAMS += hardlink MANPAGES += misc-utils/hardlink.1 +dist_noinst_DATA += misc-utils/hardlink.1.adoc hardlink_SOURCES = misc-utils/hardlink.c lib/monotonic.c hardlink_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS) hardlink_CFLAGS = $(AM_CFLAGS) diff --git a/schedutils/Makemodule.am b/schedutils/Makemodule.am index 56a3716d9..1040da85f 100644 --- a/schedutils/Makemodule.am +++ b/schedutils/Makemodule.am @@ -1,6 +1,7 @@ if BUILD_CHRT usrbin_exec_PROGRAMS += chrt MANPAGES += schedutils/chrt.1 +dist_noinst_DATA += schedutils/chrt.1.adoc chrt_SOURCES = schedutils/chrt.c schedutils/sched_attr.h chrt_LDADD = $(LDADD) libcommon.la endif @@ -8,6 +9,7 @@ endif if BUILD_IONICE usrbin_exec_PROGRAMS += ionice MANPAGES += schedutils/ionice.1 +dist_noinst_DATA += schedutils/ionice.1.adoc ionice_SOURCES = schedutils/ionice.c ionice_LDADD = $(LDADD) libcommon.la endif @@ -15,6 +17,7 @@ endif if BUILD_TASKSET usrbin_exec_PROGRAMS += taskset MANPAGES += schedutils/taskset.1 +dist_noinst_DATA += schedutils/taskset.1.adoc taskset_SOURCES = schedutils/taskset.c taskset_LDADD = $(LDADD) libcommon.la endif @@ -22,6 +25,7 @@ endif if BUILD_UCLAMPSET usrbin_exec_PROGRAMS += uclampset MANPAGES += schedutils/uclampset.1 +dist_noinst_DATA += schedutils/uclampset.1.adoc uclampset_SOURCES = schedutils/uclampset.c schedutils/sched_attr.h uclampset_LDADD = $(LDADD) libcommon.la endif diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 3f2ecdab1..470f30453 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -1,6 +1,7 @@ if BUILD_LSMEM usrbin_exec_PROGRAMS += lsmem MANPAGES += sys-utils/lsmem.1 +dist_noinst_DATA += sys-utils/lsmem.1.adoc lsmem_SOURCES = sys-utils/lsmem.c lsmem_LDADD = $(LDADD) libcommon.la libsmartcols.la lsmem_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -9,6 +10,7 @@ endif if BUILD_CHMEM usrbin_exec_PROGRAMS += chmem MANPAGES += sys-utils/chmem.8 +dist_noinst_DATA += sys-utils/chmem.8.adoc chmem_SOURCES = sys-utils/chmem.c chmem_LDADD = $(LDADD) libcommon.la endif @@ -16,6 +18,7 @@ endif if BUILD_FLOCK usrbin_exec_PROGRAMS += flock MANPAGES += sys-utils/flock.1 +dist_noinst_DATA += sys-utils/flock.1.adoc flock_SOURCES = sys-utils/flock.c lib/monotonic.c lib/timer.c flock_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS) endif @@ -23,6 +26,7 @@ endif if BUILD_CHOOM usrbin_exec_PROGRAMS += choom MANPAGES += sys-utils/choom.1 +dist_noinst_DATA += sys-utils/choom.1.adoc choom_SOURCES = sys-utils/choom.c choom_LDADD = $(LDADD) libcommon.la endif @@ -30,6 +34,7 @@ endif if BUILD_IPCMK usrbin_exec_PROGRAMS += ipcmk MANPAGES += sys-utils/ipcmk.1 +dist_noinst_DATA += sys-utils/ipcmk.1.adoc ipcmk_SOURCES = sys-utils/ipcmk.c ipcmk_LDADD = $(LDADD) libcommon.la endif @@ -37,6 +42,7 @@ endif if BUILD_IPCRM usrbin_exec_PROGRAMS += ipcrm MANPAGES += sys-utils/ipcrm.1 +dist_noinst_DATA += sys-utils/ipcrm.1.adoc ipcrm_SOURCES = sys-utils/ipcrm.c ipcrm_LDADD = $(LDADD) libcommon.la endif @@ -44,6 +50,7 @@ endif if BUILD_IPCS usrbin_exec_PROGRAMS += ipcs MANPAGES += sys-utils/ipcs.1 +dist_noinst_DATA += sys-utils/ipcs.1.adoc ipcs_SOURCES = sys-utils/ipcs.c \ sys-utils/ipcutils.c \ sys-utils/ipcutils.h @@ -53,6 +60,7 @@ endif if BUILD_IRQTOP usrbin_exec_PROGRAMS += irqtop MANPAGES += sys-utils/irqtop.1 +dist_noinst_DATA += sys-utils/irqtop.1.adoc irqtop_SOURCES = sys-utils/irqtop.c \ sys-utils/irq-common.c \ sys-utils/irq-common.h \ @@ -70,6 +78,7 @@ endif if BUILD_LSIRQ usrbin_exec_PROGRAMS += lsirq MANPAGES += sys-utils/lsirq.1 +dist_noinst_DATA += sys-utils/lsirq.1.adoc lsirq_SOURCES = sys-utils/lsirq.c \ sys-utils/irq-common.c \ sys-utils/irq-common.h @@ -80,6 +89,7 @@ endif if BUILD_LSIPC usrbin_exec_PROGRAMS += lsipc MANPAGES += sys-utils/lsipc.1 +dist_noinst_DATA += sys-utils/lsipc.1.adoc lsipc_SOURCES = sys-utils/lsipc.c \ sys-utils/ipcutils.c \ sys-utils/ipcutils.h @@ -90,12 +100,14 @@ endif if BUILD_RENICE usrbin_exec_PROGRAMS += renice MANPAGES += sys-utils/renice.1 +dist_noinst_DATA += sys-utils/renice.1.adoc renice_SOURCES = sys-utils/renice.c endif if BUILD_RFKILL usrsbin_exec_PROGRAMS += rfkill MANPAGES += sys-utils/rfkill.8 +dist_noinst_DATA += sys-utils/rfkill.8.adoc rfkill_SOURCES = sys-utils/rfkill.c rfkill_LDADD = $(LDADD) libcommon.la libsmartcols.la rfkill_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -104,18 +116,21 @@ endif if BUILD_SETSID usrbin_exec_PROGRAMS += setsid MANPAGES += sys-utils/setsid.1 +dist_noinst_DATA += sys-utils/setsid.1.adoc setsid_SOURCES = sys-utils/setsid.c endif if BUILD_READPROFILE usrsbin_exec_PROGRAMS += readprofile MANPAGES += sys-utils/readprofile.8 +dist_noinst_DATA += sys-utils/readprofile.8.adoc readprofile_SOURCES = sys-utils/readprofile.c endif if BUILD_TUNELP usrsbin_exec_PROGRAMS += tunelp MANPAGES += sys-utils/tunelp.8 +dist_noinst_DATA += sys-utils/tunelp.8.adoc tunelp_SOURCES = sys-utils/tunelp.c tunelp_LDADD = $(LDADD) libcommon.la endif @@ -123,6 +138,7 @@ endif if BUILD_FSTRIM sbin_PROGRAMS += fstrim MANPAGES += sys-utils/fstrim.8 +dist_noinst_DATA += sys-utils/fstrim.8.adoc fstrim_SOURCES = sys-utils/fstrim.c fstrim_LDADD = $(LDADD) libcommon.la libmount.la fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) @@ -139,6 +155,7 @@ EXTRA_DIST += sys-utils/fstrim.timer if BUILD_DMESG bin_PROGRAMS += dmesg MANPAGES += sys-utils/dmesg.1 +dist_noinst_DATA += sys-utils/dmesg.1.adoc dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(REALTIME_LIBS) dmesg_CFLAGS = $(AM_CFLAGS) @@ -151,6 +168,7 @@ endif if BUILD_CTRLALTDEL sbin_PROGRAMS += ctrlaltdel MANPAGES += sys-utils/ctrlaltdel.8 +dist_noinst_DATA += sys-utils/ctrlaltdel.8.adoc ctrlaltdel_SOURCES = sys-utils/ctrlaltdel.c ctrlaltdel_LDADD = $(LDADD) libcommon.la endif @@ -158,12 +176,14 @@ endif if BUILD_FSFREEZE sbin_PROGRAMS += fsfreeze MANPAGES += sys-utils/fsfreeze.8 +dist_noinst_DATA += sys-utils/fsfreeze.8.adoc fsfreeze_SOURCES = sys-utils/fsfreeze.c endif if BUILD_BLKDISCARD sbin_PROGRAMS += blkdiscard MANPAGES += sys-utils/blkdiscard.8 +dist_noinst_DATA += sys-utils/blkdiscard.8.adoc blkdiscard_SOURCES = sys-utils/blkdiscard.c lib/monotonic.c blkdiscard_LDADD = $(LDADD) libblkid.la libcommon.la $(REALTIME_LIBS) blkdiscard_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) @@ -172,6 +192,7 @@ endif if BUILD_BLKZONE sbin_PROGRAMS += blkzone MANPAGES += sys-utils/blkzone.8 +dist_noinst_DATA += sys-utils/blkzone.8.adoc blkzone_SOURCES = sys-utils/blkzone.c blkzone_LDADD = $(LDADD) libcommon.la endif @@ -179,6 +200,7 @@ endif if BUILD_LDATTACH usrsbin_exec_PROGRAMS += ldattach MANPAGES += sys-utils/ldattach.8 +dist_noinst_DATA += sys-utils/ldattach.8.adoc ldattach_SOURCES = sys-utils/ldattach.c ldattach_LDADD = $(LDADD) libcommon.la endif @@ -186,6 +208,7 @@ endif if BUILD_RTCWAKE usrsbin_exec_PROGRAMS += rtcwake MANPAGES += sys-utils/rtcwake.8 +dist_noinst_DATA += sys-utils/rtcwake.8.adoc rtcwake_SOURCES = sys-utils/rtcwake.c rtcwake_LDADD = $(LDADD) libcommon.la endif @@ -193,6 +216,7 @@ endif if BUILD_SETARCH usrbin_exec_PROGRAMS += setarch MANPAGES += sys-utils/setarch.8 +dist_noinst_DATA += sys-utils/setarch.8.adoc setarch_SOURCES = sys-utils/setarch.c SETARCH_LINKS = uname26 linux32 linux64 @@ -252,6 +276,7 @@ endif # BUILD_SETARCH if BUILD_EJECT usrbin_exec_PROGRAMS += eject MANPAGES += sys-utils/eject.1 +dist_noinst_DATA += sys-utils/eject.1.adoc eject_SOURCES = sys-utils/eject.c lib/monotonic.c eject_LDADD = $(LDADD) libmount.la libcommon.la $(REALTIME_LIBS) eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) @@ -261,6 +286,7 @@ endif if BUILD_LOSETUP sbin_PROGRAMS += losetup MANPAGES += sys-utils/losetup.8 +dist_noinst_DATA += sys-utils/losetup.8.adoc losetup_SOURCES = sys-utils/losetup.c losetup_LDADD = $(LDADD) libcommon.la libsmartcols.la losetup_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -278,6 +304,7 @@ endif # BUILD_LOSETUP if BUILD_ZRAMCTL sbin_PROGRAMS += zramctl MANPAGES += sys-utils/zramctl.8 +dist_noinst_DATA += sys-utils/zramctl.8.adoc zramctl_SOURCES = sys-utils/zramctl.c \ lib/ismounted.c zramctl_LDADD = $(LDADD) libcommon.la libsmartcols.la @@ -288,6 +315,7 @@ endif if BUILD_PRLIMIT usrbin_exec_PROGRAMS += prlimit MANPAGES += sys-utils/prlimit.1 +dist_noinst_DATA += sys-utils/prlimit.1.adoc prlimit_SOURCES = sys-utils/prlimit.c prlimit_LDADD = $(LDADD) libcommon.la libsmartcols.la prlimit_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -297,6 +325,7 @@ endif if BUILD_LSNS usrbin_exec_PROGRAMS += lsns MANPAGES += sys-utils/lsns.8 +dist_noinst_DATA += sys-utils/lsns.8.adoc lsns_SOURCES = sys-utils/lsns.c lsns_LDADD = $(LDADD) libcommon.la libsmartcols.la libmount.la lsns_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) -I$(ul_libmount_incdir) @@ -309,6 +338,10 @@ MANPAGES += \ sys-utils/mount.8 \ sys-utils/fstab.5 \ sys-utils/umount.8 +dist_noinst_DATA += \ + sys-utils/mount.8.adoc \ + sys-utils/fstab.5.adoc \ + sys-utils/umount.8.adoc mount_SOURCES = sys-utils/mount.c mount_LDADD = $(LDADD) libcommon.la libmount.la $(SELINUX_LIBS) mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir) @@ -356,6 +389,7 @@ endif # BUILD_MOUNT if BUILD_SWAPON sbin_PROGRAMS += swapon swapoff MANPAGES += sys-utils/swapon.8 +dist_noinst_DATA += sys-utils/swapon.8.adoc MANLINKS += sys-utils/swapoff.8 swapon_SOURCES = \ @@ -392,6 +426,7 @@ endif if BUILD_LSCPU usrbin_exec_PROGRAMS += lscpu MANPAGES += sys-utils/lscpu.1 +dist_noinst_DATA += sys-utils/lscpu.1.adoc lscpu_SOURCES = sys-utils/lscpu.c \ sys-utils/lscpu-cputype.c \ sys-utils/lscpu-cpu.c \ @@ -407,6 +442,7 @@ endif if BUILD_CHCPU sbin_PROGRAMS += chcpu MANPAGES += sys-utils/chcpu.8 +dist_noinst_DATA += sys-utils/chcpu.8.adoc chcpu_SOURCES = sys-utils/chcpu.c chcpu_LDADD = $(LDADD) libcommon.la endif @@ -414,6 +450,7 @@ endif if BUILD_WDCTL bin_PROGRAMS += wdctl MANPAGES += sys-utils/wdctl.8 +dist_noinst_DATA += sys-utils/wdctl.8.adoc wdctl_SOURCES = sys-utils/wdctl.c wdctl_LDADD = $(LDADD) libcommon.la libsmartcols.la wdctl_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -422,6 +459,7 @@ endif if BUILD_MOUNTPOINT bin_PROGRAMS += mountpoint MANPAGES += sys-utils/mountpoint.1 +dist_noinst_DATA += sys-utils/mountpoint.1.adoc mountpoint_LDADD = $(LDADD) libmount.la mountpoint_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) mountpoint_SOURCES = sys-utils/mountpoint.c @@ -430,6 +468,7 @@ endif if BUILD_FALLOCATE usrbin_exec_PROGRAMS += fallocate MANPAGES += sys-utils/fallocate.1 +dist_noinst_DATA += sys-utils/fallocate.1.adoc fallocate_SOURCES = sys-utils/fallocate.c fallocate_LDADD = $(LDADD) libcommon.la endif @@ -437,18 +476,21 @@ endif if BUILD_PIVOT_ROOT sbin_PROGRAMS += pivot_root MANPAGES += sys-utils/pivot_root.8 +dist_noinst_DATA += sys-utils/pivot_root.8.adoc pivot_root_SOURCES = sys-utils/pivot_root.c endif if BUILD_SWITCH_ROOT sbin_PROGRAMS += switch_root MANPAGES += sys-utils/switch_root.8 +dist_noinst_DATA += sys-utils/switch_root.8.adoc switch_root_SOURCES = sys-utils/switch_root.c endif if BUILD_UNSHARE usrbin_exec_PROGRAMS += unshare MANPAGES += sys-utils/unshare.1 +dist_noinst_DATA += sys-utils/unshare.1.adoc unshare_SOURCES = sys-utils/unshare.c \ lib/caputils.c \ lib/exec_shell.c @@ -467,6 +509,7 @@ endif if BUILD_NSENTER usrbin_exec_PROGRAMS += nsenter MANPAGES += sys-utils/nsenter.1 +dist_noinst_DATA += sys-utils/nsenter.1.adoc nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c nsenter_LDADD = $(LDADD) libcommon.la $(SELINUX_LIBS) @@ -483,6 +526,9 @@ sbin_PROGRAMS += hwclock MANPAGES += \ sys-utils/hwclock.8 \ sys-utils/adjtime_config.5 +dist_noinst_DATA += \ + sys-utils/hwclock.8.adoc \ + sys-utils/adjtime_config.5.adoc hwclock_SOURCES = \ sys-utils/hwclock.c \ sys-utils/hwclock.h @@ -510,6 +556,7 @@ endif # BUILD_HWCLOCK if BUILD_SETPRIV usrbin_exec_PROGRAMS += setpriv MANPAGES += sys-utils/setpriv.1 +dist_noinst_DATA += sys-utils/setpriv.1.adoc setpriv_SOURCES = sys-utils/setpriv.c \ lib/caputils.c setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am index 509833e2f..119324f5b 100644 --- a/term-utils/Makemodule.am +++ b/term-utils/Makemodule.am @@ -1,6 +1,7 @@ if BUILD_SCRIPT usrbin_exec_PROGRAMS += script MANPAGES += term-utils/script.1 +dist_noinst_DATA += term-utils/script.1.adoc script_SOURCES = term-utils/script.c \ lib/pty-session.c \ include/pty-session.h \ @@ -20,6 +21,7 @@ endif # BUILD_SCRIPT if BUILD_SCRIPTREPLAY usrbin_exec_PROGRAMS += scriptreplay MANPAGES += term-utils/scriptreplay.1 +dist_noinst_DATA += term-utils/scriptreplay.1.adoc scriptreplay_SOURCES = term-utils/scriptreplay.c \ term-utils/script-playutils.c \ term-utils/script-playutils.h @@ -29,6 +31,7 @@ endif # BUILD_SCRIPTREPLAY if BUILD_SCRIPTLIVE usrbin_exec_PROGRAMS += scriptlive MANPAGES += term-utils/scriptlive.1 +dist_noinst_DATA += term-utils/scriptlive.1.adoc scriptlive_SOURCES = term-utils/scriptlive.c \ term-utils/script-playutils.c \ term-utils/script-playutils.h \ @@ -42,6 +45,7 @@ endif # BUILD_SCRIPTLIVE if BUILD_AGETTY sbin_PROGRAMS += agetty MANPAGES += term-utils/agetty.8 +dist_noinst_DATA += term-utils/agetty.8.adoc agetty_SOURCES = term-utils/agetty.c if USE_PLYMOUTH_SUPPORT agetty_SOURCES += lib/plymouth-ctrl.c @@ -56,6 +60,7 @@ endif # BUILD_AGETTY if BUILD_SETTERM usrbin_exec_PROGRAMS += setterm MANPAGES += term-utils/setterm.1 +dist_noinst_DATA += term-utils/setterm.1.adoc setterm_SOURCES = term-utils/setterm.c setterm_CFLAGS = $(AM_CFLAGS) setterm_LDADD = $(LDADD) libcommon.la @@ -73,6 +78,7 @@ if BUILD_MESG usrbin_exec_PROGRAMS += mesg mesg_LDADD = $(LDADD) libcommon.la MANPAGES += term-utils/mesg.1 +dist_noinst_DATA += term-utils/mesg.1.adoc mesg_SOURCES = term-utils/mesg.c endif @@ -84,6 +90,7 @@ wall_SOURCES = \ term-utils/ttymsg.c \ term-utils/ttymsg.h MANPAGES += term-utils/wall.1 +dist_noinst_DATA += term-utils/wall.1.adoc wall_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) wall_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) wall_LDADD = $(LDADD) libcommon.la @@ -102,6 +109,7 @@ endif # BUILD_WALL if BUILD_WRITE usrbin_exec_PROGRAMS += write MANPAGES += term-utils/write.1 +dist_noinst_DATA += term-utils/write.1.adoc write_SOURCES = term-utils/write.c write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index 66df9f999..af1bf0238 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -1,6 +1,7 @@ if BUILD_COL usrbin_exec_PROGRAMS += col MANPAGES += text-utils/col.1 +dist_noinst_DATA += text-utils/col.1.adoc col_SOURCES = text-utils/col.c col_LDADD = $(LDADD) libcommon.la endif @@ -8,12 +9,14 @@ endif if BUILD_COLCRT usrbin_exec_PROGRAMS += colcrt MANPAGES += text-utils/colcrt.1 +dist_noinst_DATA += text-utils/colcrt.1.adoc colcrt_SOURCES = text-utils/colcrt.c endif if BUILD_COLRM usrbin_exec_PROGRAMS += colrm MANPAGES += text-utils/colrm.1 +dist_noinst_DATA += text-utils/colrm.1.adoc colrm_SOURCES = text-utils/colrm.c colrm_LDADD = $(LDADD) libcommon.la endif @@ -21,6 +24,7 @@ endif if BUILD_COLUMN usrbin_exec_PROGRAMS += column MANPAGES += text-utils/column.1 +dist_noinst_DATA += text-utils/column.1.adoc column_SOURCES = text-utils/column.c column_LDADD = $(LDADD) libcommon.la libsmartcols.la column_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -29,6 +33,7 @@ endif if BUILD_HEXDUMP usrbin_exec_PROGRAMS += hexdump MANPAGES += text-utils/hexdump.1 +dist_noinst_DATA += text-utils/hexdump.1.adoc hexdump_SOURCES = \ text-utils/hexdump-conv.c \ text-utils/hexdump-display.c \ @@ -41,18 +46,21 @@ endif if BUILD_REV usrbin_exec_PROGRAMS += rev MANPAGES += text-utils/rev.1 +dist_noinst_DATA += text-utils/rev.1.adoc rev_SOURCES = text-utils/rev.c endif if BUILD_LINE usrbin_exec_PROGRAMS += line MANPAGES += text-utils/line.1 +dist_noinst_DATA += text-utils/line.1.adoc line_SOURCES = text-utils/line.c endif if BUILD_PG usrbin_exec_PROGRAMS += pg MANPAGES += text-utils/pg.1 +dist_noinst_DATA += text-utils/pg.1.adoc pg_SOURCES = text-utils/pg.c pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) $(TINFO_CFLAGS) pg_LDADD = $(LDADD) libcommon.la $(NCURSES_LIBS) $(TINFO_LIBS) @@ -62,6 +70,7 @@ endif # BUILD_PG if BUILD_UL usrbin_exec_PROGRAMS += ul MANPAGES += text-utils/ul.1 +dist_noinst_DATA += text-utils/ul.1.adoc ul_SOURCES = text-utils/ul.c ul_CFLAGS = $(AM_CFLAGS) ul_LDADD = $(LDADD) @@ -78,6 +87,7 @@ endif # BUILD_UL if BUILD_MORE bin_PROGRAMS += more MANPAGES += text-utils/more.1 +dist_noinst_DATA += text-utils/more.1.adoc more_SOURCES = text-utils/more.c more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) more_LDADD = $(LDADD) $(MAGIC_LIBS) libcommon.la