Re: removing graphics.h from stamp-prereq in src/Makefile.in

[John W. Eaton]

On  5-Feb-2008, Michael Goffioul wrote:

| On Mon, Feb 4, 2008 at 8:58 PM, John W. Eaton <address@hidden> wrote:
| > If you simply remove graphics.h from the list of files in the
| > stamp-prereq target, I think you will break some other things.
| 
| Indeed, it break MSVC compilation, because it does not use automatic
| dependencies; hence graphics.h is not built before graphics.cc, resulting
| in compilation error. Could you also include this little patch?

If you omit dependency information, how do you ensure that all the
necessary files have been recompiled when a .h file changes (for
example)?

What about doing the following instead?  Then we don't need special
cases for individual files.

jwe


ChangeLog:

2008-02-05  John W. Eaton  <address@hidden>

        * dlfcn/Makefile.in: Unconditionally include $(MAKEDEPS).
        Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true.

libcruft/ChangeLog:

2008-02-05  John W. Eaton  <address@hidden>

        * misc/Makefile.in: Unconditionally include $(MAKEDEPS).
        Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true.

liboctave/ChangeLog:

2008-02-05  John W. Eaton  <address@hidden>

        * Makefile.in: Unconditionally include $(MAKEDEPS).
        Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true.

src/ChangeLog:

2008-02-05  John W. Eaton  <address@hidden>

        * Makefile.in: Unconditionally include $(MAKEDEPS).
        Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true.


Index: dlfcn/Makefile.in
===================================================================
RCS file: /cvs/octave/dlfcn/Makefile.in,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile.in
--- dlfcn/Makefile.in   12 Oct 2007 21:27:12 -0000      1.13
+++ dlfcn/Makefile.in   5 Feb 2008 23:08:09 -0000
@@ -86,6 +86,8 @@
        ln $(addprefix $(srcdir)/, octave.cc Makefile.in) ../`cat 
../.fname`/dlfcn
 .PHONY: conf-dist
 
-ifndef omit_deps
--include $(MAKEDEPS)
+ifdef omit_deps
+.PHONY: $(MAKEDEPS)
 endif
+
+-include $(MAKEDEPS)
Index: libcruft/misc/Makefile.in
===================================================================
RCS file: /cvs/octave/libcruft/misc/Makefile.in,v
retrieving revision 1.41
diff -u -u -r1.41 Makefile.in
--- libcruft/misc/Makefile.in   12 Oct 2007 21:27:12 -0000      1.41
+++ libcruft/misc/Makefile.in   5 Feb 2008 23:08:09 -0000
@@ -69,6 +69,8 @@
 pic/machar.o: $(srcdir)/machar.c
        $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@
 
-ifndef omit_deps
--include $(MAKEDEPS)
+ifdef omit_deps
+.PHONY: $(MAKEDEPS)
 endif
+
+-include $(MAKEDEPS)
Index: liboctave/Makefile.in
===================================================================
RCS file: /cvs/octave/liboctave/Makefile.in,v
retrieving revision 1.236
diff -u -u -r1.236 Makefile.in
--- liboctave/Makefile.in       4 Feb 2008 21:18:05 -0000       1.236
+++ liboctave/Makefile.in       5 Feb 2008 23:08:10 -0000
@@ -270,6 +270,8 @@
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
 
+$(MAKEDEPS): stamp-prereq
+
 check: all
 .PHONY: check
 
@@ -372,12 +374,8 @@
        $(AWK) -f $(srcdir)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h 
$(srcdir)/mx-ops > address@hidden
        $(simple-move-if-change-rule)
 
-
-# If missing, GNU make attempts to create them in the reverse of the
-# order in which they are listed here.  We rely on that fact to ensure
-# that defaults.h is created before trying to create the .d files.
-# Hmm.  I wonder if we can count on that...
-
-ifndef omit_deps
--include $(MAKEDEPS) stamp-prereq
+ifdef omit_deps
+.PHONY: $(MAKEDEPS)
 endif
+
+-include $(MAKEDEPS)
Index: src/Makefile.in
===================================================================
RCS file: /cvs/octave/src/Makefile.in,v
retrieving revision 1.460
diff -u -u -r1.460 Makefile.in
--- src/Makefile.in     4 Feb 2008 21:17:18 -0000       1.460
+++ src/Makefile.in     5 Feb 2008 23:08:13 -0000
@@ -405,7 +405,7 @@
 
 $(DEF_FILES): stamp-prereq stamp-liboctave-prereq mkdefs
 
-$(MAKEDEPS): stamp-prereq stamp-liboctave-prereq graphics.h oct-gperf.h 
oct-gperf.h parse.cc lex.cc $(OPT_HANDLERS)
+$(MAKEDEPS): stamp-prereq stamp-liboctave-prereq graphics.h oct-gperf.h 
parse.cc lex.cc $(OPT_HANDLERS)
 
 check: all
 .PHONY: check
@@ -645,6 +645,8 @@
 check: all
 .PHONY: check
 
-ifndef omit_deps
--include $(MAKEDEPS)
+ifdef omit_deps
+.PHONY: $(MAKEDEPS)
 endif
+
+-include $(MAKEDEPS)