From 3e377db29466e8a7d960df27fa5c0b933a3fa581 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 9 Dec 2000 02:37:33 +0000 Subject: [PATCH] ChangeLog, MCONFIG.in, Makefile.in, Makefile.in.in: Fix so that top-level "make check" works correctly. e2image.c: Fix program name for e2image. --- ChangeLog | 5 +++++ MCONFIG.in | 2 ++ Makefile.in | 5 ++--- misc/e2image.c | 2 +- po/ChangeLog | 5 +++++ po/Makefile.in.in | 2 +- resize/ChangeLog | 4 ++++ resize/Makefile.in | 2 +- tests/progs/ChangeLog | 5 +++++ tests/progs/Makefile.in | 2 -- 10 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 po/ChangeLog diff --git a/ChangeLog b/ChangeLog index 4cf79682..e6130c1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-08 + + * MCONFIG.in, Makefile.in: Fix so that top-level "make check" + works correctly. + 2000-10-24 * e2fsprogs.spec: Update spec file for Red Hat 7.0 compatibility diff --git a/MCONFIG.in b/MCONFIG.in index 89918ca6..fb52574e 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -2,6 +2,8 @@ all:: +check:: + SHELL = /bin/sh prefix = @prefix@ diff --git a/Makefile.in b/Makefile.in index 6a5bae9e..c6200979 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,7 +48,7 @@ install-libs: install-libs-recursive uninstall-libs: uninstall-libs-recursive -TAGS clean-recursive distclean-recursive depend-recursive \ +TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ mostlyclean-recursive realclean-recursive install-recursive: for subdir in $(SUBDIRS); do \ if test -d $$subdir ; then \ @@ -104,8 +104,7 @@ distclean-local: clean-local realclean-local: distclean-local $(RM) -f configure -check: - cd tests && $(MAKE) check +check:: check-recursive distribution_tar_file: $(RM) -rf /tmp/dest diff --git a/misc/e2image.c b/misc/e2image.c index 2cdf2fe4..0dcc0196 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -40,7 +40,7 @@ extern int optind; #include "../version.h" #include "nls-enable.h" -const char * program_name = "e2label"; +const char * program_name = "e2image"; char * device_name = NULL; static void usage(void) diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 00000000..2f537652 --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,5 @@ +2000-12-08 + + * Makefile.in.in: Fix so that top-level "make check" works + correctly. + diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 111b40fc..08200648 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -178,7 +178,7 @@ uninstall: done rm -f $(gettextsrcdir)/po-Makefile.in.in -check: all +check:: all cat-id-tbl.o: ../intl/libgettext.h diff --git a/resize/ChangeLog b/resize/ChangeLog index 6e974a43..42271135 100644 --- a/resize/ChangeLog +++ b/resize/ChangeLog @@ -1,3 +1,7 @@ +2000-12-08 + + * Makefile.in: Fix so that top-level "make check" works correctly. + 2000-07-13 * Release of E2fsprogs 1.19 diff --git a/resize/Makefile.in b/resize/Makefile.in index c833c4f0..319abfb4 100644 --- a/resize/Makefile.in +++ b/resize/Makefile.in @@ -73,7 +73,7 @@ uninstall: test_extent.out: test_extent $(srcdir)/test_extent.in ./test_extent < $(srcdir)/test_extent.in > test_extent.out -check: test_extent.out +check:: test_extent.out @if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \ echo "Test succeeded." ; \ else \ diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog index 286af8b8..0b504ad6 100644 --- a/tests/progs/ChangeLog +++ b/tests/progs/ChangeLog @@ -1,3 +1,8 @@ +2000-12-08 + + * Makefile.in (srcdir): Fix so that top-level "make check" works + correctly. + 2000-10-18 * random_exercise.c: Add support for making the test files have a diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index a4f13628..53c59979 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -49,8 +49,6 @@ install: uninstall: -check: - mostlyclean: clean distclean: clean $(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old