Problem with "make distclean" and dependencies

[John W. Eaton]

On 11-Feb-2008, Michael Goffioul wrote:

| When I do a "make distclean", I get the following error in src/ directory:
| 
| make[2]: Entering directory `/c/Sources/playground/c/octave-hg/build-msvc/src'
| make -C ../liboctave ../liboctave/DASPK-opts.h
| make[3]: Entering directory
| `/c/Sources/playground/c/octave-hg/build-msvc/liboctave'
| make[3]: *** No rule to make target `../liboctave/DASPK-opts.h'.  Stop.
| 
| I think it's due to the fact that in src/Makefile.in, $(MAKEDEPS)
| depends on $(OPT_INC) and when make tries to rebuild
| ../liboctave/DASPK-opts.h, the Makefile has already been removed
| in liboctave/ directory.

Please try the following patch.

Thanks,

jwe


# HG changeset patch
# User John W. Eaton <address@hidden>
# Date 1202771544 18000
# Node ID 49d462292af445c042c004c3f1c1fe9bb8243367
# Parent  8d6ab12f8fda3d17be69c515a726716af0c88ca7
omit more dependencies for distclean target

diff -r 8d6ab12f8fda -r 49d462292af4 liboctave/ChangeLog
--- a/liboctave/ChangeLog       Sat Feb 09 03:37:39 2008 -0500
+++ b/liboctave/ChangeLog       Mon Feb 11 18:12:24 2008 -0500
@@ -1,3 +1,7 @@ 2008-02-08  John W. Eaton  <address@hidden
+2008-02-11  John W. Eaton  <address@hidden>
+
+       * Makefile.in ($(MAKEDEPS)): Skip dependencies if omit_deps is defined.
+
 2008-02-08  John W. Eaton  <address@hidden>
 
        * oct-sort.h (enum sortmode): Eliminate UNDEFINED.  Change all
diff -r 8d6ab12f8fda -r 49d462292af4 liboctave/Makefile.in
--- a/liboctave/Makefile.in     Sat Feb 09 03:37:39 2008 -0500
+++ b/liboctave/Makefile.in     Mon Feb 11 18:12:24 2008 -0500
@@ -262,7 +262,9 @@ endif
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
 
+ifndef omit_deps
 $(MAKEDEPS): $(PREREQ)
+endif
 
 check: all
 .PHONY: check
diff -r 8d6ab12f8fda -r 49d462292af4 src/ChangeLog
--- a/src/ChangeLog     Sat Feb 09 03:37:39 2008 -0500
+++ b/src/ChangeLog     Mon Feb 11 18:12:24 2008 -0500
@@ -1,3 +1,7 @@ 2008-02-09  John W. Eaton  <address@hidden
+2008-02-11  John W. Eaton  <address@hidden>
+
+       * Makefile.in ($(MAKEDEPS)): Skip dependencies if omit_deps is defined.
+
 2008-02-09  John W. Eaton  <address@hidden>
 
        * pr-output.cc (set_range_format): Eliminate sign arg.
diff -r 8d6ab12f8fda -r 49d462292af4 src/Makefile.in
--- a/src/Makefile.in   Sat Feb 09 03:37:39 2008 -0500
+++ b/src/Makefile.in   Mon Feb 11 18:12:24 2008 -0500
@@ -402,7 +402,9 @@ PREREQ := defaults.h graphics.h oct-conf
 
 $(DEF_FILES): $(OPT_INC) mkdefs 
 
+ifndef omit_deps
 $(MAKEDEPS): $(OPT_INC) $(OPT_HANDLERS) $(PREREQ)
+endif
 
 check: all
 .PHONY: check