ChangeLog, MCONFIG.in, Makefile.in, Makefile.in.in:

  Fix so that top-level "make check" works correctly.
e2image.c:
  Fix program name for e2image.

diff --git a/ChangeLog b/ChangeLog
index 4cf796823804e6842b14a7c4668d17f886b1fe3a..e6130c1bd5e224d1bc6e080e37d9346036d83f12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-08    <tytso@snap.thunk.org>
+
+       * MCONFIG.in, Makefile.in: Fix so that top-level "make check"
+               works correctly.
+
 2000-10-24    <tytso@snap.thunk.org>
 
        * e2fsprogs.spec: Update spec file for Red Hat 7.0 compatibility

diff --git a/MCONFIG.in b/MCONFIG.in
index 89918ca64585751a8765f34645184cd623f4d670..fb52574e24c7978e38c1ad6a43ee2bd615f6af3f 100644 (file)
--- 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 6a5bae9e9415e8b988d5f15cd459ce3c9865ae70..c6200979cf3bb396dc9d73dfa80f1fc32b75fce0 100644 (file)
--- 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 2cdf2fe43311895c9729d90484ee53927ec9bc65..0dcc0196bde8357c641071566ab661365153969a 100644 (file)
--- 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 (file)
index 0000000..2f53765
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,5 @@
+2000-12-08    <tytso@snap.thunk.org>
+
+       * 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 111b40fcbb6664771b9f09c3cd91fff9dccffe75..082006483a01b6216942c0cd1f67dd95e33ae6cf 100644 (file)
--- 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 6e974a439b145b43aa96b11be406b31bbe62cbb8..422711353fbe5987804073d0e550afed7fe8c19f 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-08    <tytso@snap.thunk.org>
+
+       * Makefile.in: Fix so that top-level "make check" works correctly.
+
 2000-07-13    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.19

diff --git a/resize/Makefile.in b/resize/Makefile.in
index c833c4f063c7d0be9a2bfa8a127acd0eb12c11db..319abfb492da9b38c0d85c1f2c05289e03e4faf3 100644 (file)
--- 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 286af8b869c55e80448d3ee5ec51ea5009aa1a19..0b504ad6447e4c5e9b74d1fe13f6fb122c536c8d 100644 (file)
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-08    <tytso@snap.thunk.org>
+
+       * Makefile.in (srcdir): Fix so that top-level "make check" works
+               correctly.
+
 2000-10-18    <tytso@valinux.com>
 
        * 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 a4f136288e5ce2534a9d42fb4307656e48e7f79a..53c5997931f1faf7825fb17df1aa35d59b71a63e 100644 (file)
--- 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