From 562218e6ea1926723045713e52449c24c6ccff1f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 4 Jan 2007 11:57:07 +0100 Subject: [PATCH] build-sys: add missing files This patch add all missing headers, man pages and README files to automake stuff and "make dist-gzip" produces useful tarball now. Signed-off-by: Karel Zak --- Makefile.am | 12 +++++++++++- configure.ac | 3 ++- disk-utils/Makefile.am | 10 ++++++---- fdisk/Makefile.am | 12 ++++++++---- getopt/Makefile.am | 3 +++ hwclock/Makefile.am | 3 ++- login-utils/Makefile.am | 23 ++++++++++++++--------- misc-utils/Makefile.am | 5 ++++- mount/Makefile.am | 20 +++++++++++++++----- partx/Makefile.am | 3 ++- sys-utils/Makefile.am | 4 ++++ text-utils/Makefile.am | 5 ++++- 12 files changed, 75 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5c3564e9..5f69f448 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,9 @@ SUBDIRS = lib \ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config/include-Makefile.am \ - autogen.sh + autogen.sh \ + licenses/COPYING.GPL \ + licenses/COPYING.UCB distclean-local: -find . \( -name \*~ -o -name \*.orig -o -name \*.rej \) -exec rm -f {} \; @@ -31,3 +33,11 @@ mrproper: distclean cd po; rm -f `cat .gitignore`; cd .. cd config; rm -f `cat ../.gitignore`; cd .. +# The automake is very stupid for work with man pages. The files from man_MANS are +# not included to the distribution. A solution is use dist_man_MANS or +# EXTRA_DIST = $(man_MANS) -- but these solutions are ugly in case that there +# is a lot of "if ", because the result in EXTRA_DIST or dist_man_MANS +# depends on the condition ;-( +dist-hook: + -find -regex "\./[a-z\-]*/[a-z\.\-\_]*\.[1-9]" -exec cp {} $(distdir)/{} \; + diff --git a/configure.ac b/configure.ac index f5e7d8b6..299e50e2 100644 --- a/configure.ac +++ b/configure.ac @@ -395,9 +395,10 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ Makefile disk-utils/Makefile -fdisk/Makefile +fdisk/Makefile getopt/Makefile hwclock/Makefile +include/Makefile lib/Makefile login-utils/Makefile misc-utils/Makefile diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index b94f155a..d9f2895c 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -4,9 +4,10 @@ man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \ fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 sbin_PROGRAMS = mkfs mkswap blockdev fsck.minix mkfs.minix mkfs.bfs -fsck_minix_SOURCES = fsck.minix.c -mkfs_minix_SOURCES = mkfs.minix.c +fsck_minix_SOURCES = fsck.minix.c bitops.h minix.h +mkfs_minix_SOURCES = mkfs.minix.c bitops.h minix.h mkfs_bfs_SOURCES = mkfs.bfs.c +mkswap_SOURCES = mkswap.c swapheader.h usrbinexec_PROGRAMS = fdformat isosize @@ -24,8 +25,8 @@ endif if BUILD_CRAMFS sbin_PROGRAMS += fsck.cramfs mkfs.cramfs -fsck_cramfs_SOURCES = fsck.cramfs.c -mkfs_cramfs_SOURCES = mkfs.cramfs.c +fsck_cramfs_SOURCES = fsck.cramfs.c cramfs.h +mkfs_cramfs_SOURCES = mkfs.cramfs.c cramfs.h fsck_cramfs_LDADD = -lz mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a endif @@ -33,3 +34,4 @@ endif if HAVE_UUID mkswap_LDADD = -luuid endif + diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index c4528d0e..36c0e38e 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -1,28 +1,31 @@ include $(top_srcdir)/config/include-Makefile.am +EXTRA_DIST = README.fdisk README.cfdisk + if !M68K sbin_PROGRAMS = fdisk man_MANS = fdisk.8 fdisk_SOURCES = fdisk.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \ - fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c + fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c \ + common.h fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h fdiskbsdlabel.h if !SPARC sbin_PROGRAMS += sfdisk man_MANS += sfdisk.8 -sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c +sfdisk_SOURCES = sfdisk.c disksize.c i386_sys_types.c partname.c common.h if USE_SLANG sbin_PROGRAMS += cfdisk man_MANS += cfdisk.8 -cfdisk_SOURCES = cfdisk.c disksize.c i386_sys_types.c +cfdisk_SOURCES = cfdisk.c disksize.c i386_sys_types.c common.h cfdisk_LDADD = -lslang else if HAVE_NCURSES sbin_PROGRAMS += cfdisk man_MANS += cfdisk.8 -cfdisk_SOURCES = cfdisk.c disksize.c i386_sys_types.c +cfdisk_SOURCES = cfdisk.c disksize.c i386_sys_types.c common.h cfdisk_LDADD = -lncurses endif endif @@ -30,3 +33,4 @@ endif endif endif + diff --git a/getopt/Makefile.am b/getopt/Makefile.am index 7ceaf02b..f375bdf7 100644 --- a/getopt/Makefile.am +++ b/getopt/Makefile.am @@ -9,3 +9,6 @@ man_MANS = getopt.1 exampledir = $(prefix)/usr/share/getopt/ example_DATA = getopt-parse.bash getopt-parse.tcsh \ getopt-test.bash getopt-test.tcsh + +EXTRA_DIST = $(example_DATA) README Changelog COPYING + diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am index 562d294f..ce48b9d3 100644 --- a/hwclock/Makefile.am +++ b/hwclock/Makefile.am @@ -4,4 +4,5 @@ man_MANS = hwclock.8 sbin_PROGRAMS = hwclock -hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c \ No newline at end of file +hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c clock.h + diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 9771ac29..cc894e19 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -6,6 +6,8 @@ sbin_PROGRAMS = usrsbinexec_PROGRAMS = man_MANS = +EXTRA_DIST = README.getty README.modems-with-agetty README.poeigl + if BUILD_AGETTY sbin_PROGRAMS += agetty man_MANS += agetty.8 @@ -17,12 +19,14 @@ sbin_PROGRAMS += simpleinit shutdown initctl man_MANS += fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \ initctl.8 +simpleinit_SOURCES = simpleinit.c my_crypt.h simpleinit.h +initctl_SOURCES = initctl.c simpleinit.h if NEED_LIBCRYPT simpleinit_LDADD = -lcrypt endif -endif +endif if BUILD_LAST usrbinexec_PROGRAMS += last @@ -36,8 +40,10 @@ usrbinexec_PROGRAMS += chfn chsh newgrp usrsbinexec_PROGRAMS += vipw man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8 -chfn_SOURCES = chfn.c islocal.c setpwnam.c -chsh_SOURCES = chsh.c islocal.c setpwnam.c +chfn_SOURCES = chfn.c islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h +chsh_SOURCES = chsh.c islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h +newgrp_SOURCES = newgrp.c my_crypt.h +vipw_SOURCES = vipw.c setpwnam.h chfn_LDADD = ../lib/libenv.a chsh_LDADD = ../lib/libenv.a @@ -56,16 +62,16 @@ if HAVE_PAM chfn_LDADD += -lpam -lpam_misc chsh_LDADD += -lpam -lpam_misc login_LDADD += -lpam -lpam_misc -login_SOURCES = login.c +login_SOURCES = login.c login.h my_crypt.h else -login_SOURCES = login.c checktty.c +login_SOURCES = login.c checktty.c login.h my_crypt.h endif if HAVE_SELINUX -chfn_SOURCES += selinux_utils.c +chfn_SOURCES += selinux_utils.c selinux_utils.h chfn_LDADD += -lselinux -chsh_SOURCES += selinux_utils.c +chsh_SOURCES += selinux_utils.c selinux_utils.h chsh_LDADD += -lselinux vipw_LDADD += -lselinux endif @@ -84,7 +90,7 @@ endif if BUILD_WALL usrbinexec_PROGRAMS += wall -wall_SOURCES = wall.c ttymsg.c +wall_SOURCES = wall.c ttymsg.c ttymsg.h man_MANS += wall.1 if USE_TTY_GROUP @@ -95,7 +101,6 @@ endif endif - if BUILD_INIT install-exec-hook:: diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 5e61fea8..4d2596dd 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/config/include-Makefile.am +EXTRA_DIST = README.cal README.namei README1.namei chkdupexe.pl \ + scriptreplay.pl + bin_PROGRAMS = usrbinexec_PROGRAMS = cal ddate logger look mcookie \ @@ -40,7 +43,7 @@ endif if BUILD_KILL bin_PROGRAMS += kill -kill_SOURCES = kill.c procs.c +kill_SOURCES = kill.c procs.c kill.h man_MANS += kill.1 endif diff --git a/mount/Makefile.am b/mount/Makefile.am index 2014e2f4..87ff57b2 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -1,29 +1,39 @@ include $(top_srcdir)/config/include-Makefile.am +EXTRA_DIST = README.mount swap.configure + AM_CPPFLAGS += -DHAVE_NFS bin_PROGRAMS = mount umount sbin_PROGRAMS = losetup swapon man_MANS = fstab.5 nfs.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 +MNTHDRS = fstab.h linux_fs.h mntent.h mount_constants.h my_dev_t.h paths.h \ + get_label_uuid.h lomount.h mount_blkid.h mount_guess_fstype.h \ + nfs_mount4.h realpath.h xmalloc.h getusername.h loop.h mount_by_label.h \ + mount_guess_rootdev.h nfsmount.h sundries.h + mount_SOURCES = mount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \ get_label_uuid.c mount_by_label.c mount_blkid.c mount_guess_fstype.c \ getusername.c \ nfsmount.c nfsmount_xdr.c nfsmount_clnt.c \ - lomount.c + lomount.c \ + $(MNTHDRS) mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a umount_SOURCES = umount.c fstab.c sundries.c xmalloc.c realpath.c mntent.c \ getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \ - lomount.c - + lomount.c \ + $(MNTHDRS) + umount_LDADD = $(top_srcdir)/lib/libenv.a swapon_SOURCES = swapon.c xmalloc.c \ - get_label_uuid.c mount_by_label.c mount_blkid.c + get_label_uuid.c mount_by_label.c mount_blkid.c \ + swap_constants.h -losetup_SOURCES = lomount.c +losetup_SOURCES = lomount.c loop.h lomount.h losetup_CFLAGS = -DMAIN if HAVE_BLKID diff --git a/partx/Makefile.am b/partx/Makefile.am index 11e7cae9..e2fb5793 100644 --- a/partx/Makefile.am +++ b/partx/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am if BUILD_PARTX usrsbinexec_PROGRAMS = addpart delpart partx -partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c +partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \ + efi.h gpt.h crc32.h partx.h dos.h endif diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 49c1211f..ee981f20 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -4,10 +4,14 @@ bin_PROGRAMS = dmesg usrbinexec_PROGRAMS = cytune flock ipcrm ipcs renice setsid +cytune_SOURCES = cytune.c cyclades.h + sbin_PROGRAMS = ctrlaltdel usrsbinexec_PROGRAMS = readprofile tunelp +tunelp_SOURCES = tunelp.c lp.h + man_MANS = flock.1 readprofile.1 \ ctrlaltdel.8 cytune.8 dmesg.8 ipcrm.8 ipcs.8 renice.8 \ setsid.8 tunelp.8 diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index aa7c9909..3c8b33bc 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -1,8 +1,11 @@ include $(top_srcdir)/config/include-Makefile.am +EXTRA_DIST = README.clear README.col README.pg README.reset LICENSE.pg + usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf -hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c +hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c \ + hexdump.h man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1 -- 2.39.5