From: Karel Zak Date: Thu, 8 Feb 2007 11:38:25 +0000 (+0100) Subject: build-sys: fix README filenames and add missing files to EXTRA_DISTs X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8d1314dc6ceeb998632102d5f93cda5e2548f8d;p=util-linux build-sys: fix README filenames and add missing files to EXTRA_DISTs Also, the patch makes "make mrproper" more robust. Signed-off-by: Karel Zak --- diff --git a/Makefile.am b/Makefile.am index b5293e2f..b1ab4e24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,19 +20,25 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config/include-Makefile.am \ autogen.sh \ - licenses/COPYING.GPL \ - licenses/COPYING.UCB + README.* \ + licenses/* \ + example.files/* \ + po/Makevars.template \ + po/update-potfiles + distclean-local: -find . \( -name \*~ -o -name \*.orig -o -name \*.rej \) -exec rm -f {} \; rm -rf autom4te.cache mrproper: distclean - -find -name Makefile.in -exec rm -f {} \; - rm -f configure ABOUT-NLS - rm -rf m4 - cd po; rm -f `cat .gitignore`; cd .. - cd config; rm -f `cat ../.gitignore`; cd .. + if [ -f ".gitignore" ]; then \ + find -name Makefile.in -exec rm -f {} \; ; \ + rm -f configure ABOUT-NLS ; \ + rm -rf m4 ; \ + cd config; rm -f `cat ../.gitignore`; cd .. ; \ + cd po; rm -f `cat .gitignore`; cd .. ; \ + fi # 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 diff --git a/TODO b/TODO index dccaf1b3..5546c316 100644 --- a/TODO +++ b/TODO @@ -10,3 +10,7 @@ (see mkswap.c and fdisk/disksize.c) - use EXIT_FAILED and EXIT_SUCCESS from stdlib.h for exit() codes + +- build-sys: + - add exampledir and example_DATA + - add readmedir and readme_DATA diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 36c0e38e..904d0019 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.fdisk README.cfdisk +EXTRA_DIST = README.* sfdisk.examples partitiontype.c if !M68K @@ -8,7 +8,8 @@ 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 \ - common.h fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h fdiskbsdlabel.h + common.h fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \ + fdiskbsdlabel.h if !SPARC diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am index ce48b9d3..d2de9822 100644 --- a/hwclock/Makefile.am +++ b/hwclock/Makefile.am @@ -6,3 +6,4 @@ sbin_PROGRAMS = hwclock hwclock_SOURCES = hwclock.c cmos.c rtc.c kd.c clock.h +EXTRA_DIST = README.* clock-ppc.c diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 4d2596dd..0e680f5a 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -1,7 +1,10 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.cal README.namei README1.namei chkdupexe.pl \ - scriptreplay.pl +EXTRA_DIST = README.* \ + chkdupexe.pl \ + scriptreplay.pl \ + reset \ + reset.033c bin_PROGRAMS = diff --git a/misc-utils/ddate.doc b/misc-utils/README.ddate similarity index 100% rename from misc-utils/ddate.doc rename to misc-utils/README.ddate diff --git a/misc-utils/flushb.c b/misc-utils/README.flushb similarity index 100% rename from misc-utils/flushb.c rename to misc-utils/README.flushb diff --git a/misc-utils/README1.namei b/misc-utils/README.namei2 similarity index 100% rename from misc-utils/README1.namei rename to misc-utils/README.namei2 diff --git a/text-utils/README.reset b/misc-utils/README.reset similarity index 100% rename from text-utils/README.reset rename to misc-utils/README.reset diff --git a/text-utils/reset b/misc-utils/reset.033c similarity index 100% rename from text-utils/reset rename to misc-utils/reset.033c diff --git a/po/POTFILES.in b/po/POTFILES.in index ad91dfa4..1c0789fc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,7 +49,6 @@ login-utils/vipw.c login-utils/wall.c misc-utils/cal.c misc-utils/ddate.c -misc-utils/flushb.c misc-utils/kill.c misc-utils/logger.c misc-utils/look.c @@ -65,12 +64,12 @@ mount/fstab.c mount/get_label_uuid.c mount/getusername.c mount/lomount.c -mount/mount_mntent.c mount/mount_blkid.c mount/mount_by_label.c mount/mount.c mount/mount_guess_fstype.c mount/mount_guess_rootdev.c +mount/mount_mntent.c mount/nfsmount.c mount/nfsmount_clnt.c mount/nfsmount_xdr.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 3ab18b0c..2be9c4b7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,19 +2,21 @@ include $(top_srcdir)/config/include-Makefile.am SUBDIRS = helpers -EXTRA_DIST = commands.sh.in \ +EXTRA_DIST = expected/* \ functions.sh \ - ts-mount-paths \ + input/* \ + README \ + run.sh \ + ts-col-multibyte \ ts-ipcs-headers \ ts-ipcs-limits \ ts-ipcs-limits2 \ + ts-ipcs.sh \ ts-mkswap-doit \ - expected/ts-mount-paths \ - expected/ts-ipcs-headers \ - expected/ts-ipcs-limits \ - expected/ts-ipcs-limits2 \ - expected/ts-mkswap-doit + ts-mount-paths \ + ts-namei-logic distclean-local: rm -rf output diff + diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index 3c8b33bc..f3c3dca8 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.clear README.col README.pg README.reset LICENSE.pg +EXTRA_DIST = README.* LICENSE.* usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf