Mercurial > octave-nkf
changeset 7448:d21150a19f80
[project @ 2008-02-05 23:11:19 by jwe]
| author | jwe |
|---|---|
| date | Tue, 05 Feb 2008 23:11:19 +0000 |
| parents | 25018e35b4cb |
| children | 3184b36b03de |
| files | ChangeLog dlfcn/Makefile.in libcruft/ChangeLog libcruft/misc/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in |
| diffstat | 8 files changed, 39 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 05 22:40:52 2008 +0000 +++ b/ChangeLog Tue Feb 05 23:11:19 2008 +0000 @@ -1,3 +1,8 @@ +2008-02-05 John W. Eaton <jwe@octave.org> + + * dlfcn/Makefile.in: Unconditionally include $(MAKEDEPS). + Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true. + 2008-01-12 John W. Eaton <jwe@octave.org> * aclocal.m4: Call AC_SUBST instead of AC_DEFINE_UNQOTED for
--- a/dlfcn/Makefile.in Tue Feb 05 22:40:52 2008 +0000 +++ b/dlfcn/Makefile.in Tue Feb 05 23:11:19 2008 +0000 @@ -86,6 +86,8 @@ ln $(addprefix $(srcdir)/, octave.cc Makefile.in) ../`cat ../.fname`/dlfcn .PHONY: conf-dist -ifndef omit_deps +ifdef omit_deps +.PHONY: $(MAKEDEPS) +endif + -include $(MAKEDEPS) -endif
--- a/libcruft/ChangeLog Tue Feb 05 22:40:52 2008 +0000 +++ b/libcruft/ChangeLog Tue Feb 05 23:11:19 2008 +0000 @@ -1,3 +1,8 @@ +2008-02-05 John W. Eaton <jwe@octave.org> + + * misc/Makefile.in: Unconditionally include $(MAKEDEPS). + Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true. + 2007-12-21 John W. Eaton <jwe@octave.org> Version 3.0.0 released.
--- a/libcruft/misc/Makefile.in Tue Feb 05 22:40:52 2008 +0000 +++ b/libcruft/misc/Makefile.in Tue Feb 05 23:11:19 2008 +0000 @@ -69,6 +69,8 @@ pic/machar.o: $(srcdir)/machar.c $(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@ -ifndef omit_deps +ifdef omit_deps +.PHONY: $(MAKEDEPS) +endif + -include $(MAKEDEPS) -endif
--- a/liboctave/ChangeLog Tue Feb 05 22:40:52 2008 +0000 +++ b/liboctave/ChangeLog Tue Feb 05 23:11:19 2008 +0000 @@ -1,3 +1,8 @@ +2008-02-05 John W. Eaton <jwe@octave.org> + + * Makefile.in: Unconditionally include $(MAKEDEPS). + Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true. + 2008-02-03 Michael Goffioul <michael.goffioul@gmail.com> * Array.cc (ascending_compare, descending_compare,
--- a/liboctave/Makefile.in Tue Feb 05 22:40:52 2008 +0000 +++ b/liboctave/Makefile.in Tue Feb 05 23:11:19 2008 +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 > $@-t $(simple-move-if-change-rule) +ifdef omit_deps +.PHONY: $(MAKEDEPS) +endif -# 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 -endif +-include $(MAKEDEPS)
--- a/src/ChangeLog Tue Feb 05 22:40:52 2008 +0000 +++ b/src/ChangeLog Tue Feb 05 23:11:19 2008 +0000 @@ -1,3 +1,8 @@ +2008-02-05 John W. Eaton <jwe@octave.org> + + * Makefile.in: Unconditionally include $(MAKEDEPS). + Mark $(MAKEDEPS) as .PHONY targets if omit_deps is true. + 2008-02-05 Michael Goffioul <michael.goffioul@gmail.com> * graphics.h.in (base_properties::get_boundingbox): New method.
--- a/src/Makefile.in Tue Feb 05 22:40:52 2008 +0000 +++ b/src/Makefile.in Tue Feb 05 23:11:19 2008 +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 +ifdef omit_deps +.PHONY: $(MAKEDEPS) +endif + -include $(MAKEDEPS) -endif