Mercurial > octave-nkf

changeset 7449:3184b36b03de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2008-02-06 08:27:00 by jwe]
author jwe
date Wed, 06 Feb 2008 08:27:00 +0000
parents d21150a19f80
children 25d42213953f
files ChangeLog examples/Makefile.in libcruft/ChangeLog libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in
diffstat 8 files changed, 66 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 05 23:11:19 2008 +0000
+++ b/ChangeLog	Wed Feb 06 08:27:00 2008 +0000
@@ -1,3 +1,8 @@
+2008-02-06  John W. Eaton  <jwe@octave.org>
+
+	* examples/Makefile.in (octave.desktop):
+	Use mv instead of move-if-change.
+
 2008-02-05  John W. Eaton  <jwe@octave.org>
 
 	* dlfcn/Makefile.in: Unconditionally include $(MAKEDEPS).
--- a/examples/Makefile.in	Tue Feb 05 23:11:19 2008 +0000
+++ b/examples/Makefile.in	Wed Feb 06 08:27:00 2008 +0000
@@ -84,7 +84,7 @@
 	$(SED) < $< > $@-t \
 	  -e "s|%OCTAVE_IMAGEDIR%|${imagedir}|" \
 	  -e "s|%OCTAVE_PREFIX%|${prefix}|"
-	$(simple-move-if-change-rule)
+	mv $@-t $@
 
 install install-strip:
 	for f in $(SCRIPTS); do \
--- a/libcruft/ChangeLog	Tue Feb 05 23:11:19 2008 +0000
+++ b/libcruft/ChangeLog	Wed Feb 06 08:27:00 2008 +0000
@@ -1,3 +1,7 @@
+2008-02-06  John W. Eaton  <jwe@octave.org>
+
+	* Makerules.in (%.def : %.f): Use mv instead of move-if-change.
+
 2008-02-05  John W. Eaton  <jwe@octave.org>
 
 	* misc/Makefile.in: Unconditionally include $(MAKEDEPS).
--- a/libcruft/Makerules.in	Tue Feb 05 23:11:19 2008 +0000
+++ b/libcruft/Makerules.in	Wed Feb 06 08:27:00 2008 +0000
@@ -40,9 +40,9 @@
 
 CRUFT_BASE = $(CRUFT_FBASE) $(CRUFT_CBASE) $(CRUFT_CXXBASE)
 
-CRUFT_FOBJ = $(addsuffix .o, $(CRUFT_FBASE) )
-CRUFT_COBJ = $(addsuffix .o, $(CRUFT_CBASE) )
-CRUFT_CXXOBJ = $(addsuffix .o, $(CRUFT_CXXBASE) )
+CRUFT_FOBJ = $(addsuffix .o, $(CRUFT_FBASE))
+CRUFT_COBJ = $(addsuffix .o, $(CRUFT_CBASE))
+CRUFT_CXXOBJ = $(addsuffix .o, $(CRUFT_CXXBASE))
 
 CRUFT_OBJ = $(CRUFT_FOBJ) $(CRUFT_COBJ) $(CRUFT_CXXOBJ)
 
@@ -113,7 +113,7 @@
 %.def : %.f
 	@echo "making $@ from $<"
 	@$(TOPDIR)/libcruft/mkf77def < $< > $@-t
-	@$(simple-move-if-change-rule)
+	@mv $@-t $@
 
 install:: all
 .PHONY: install
--- a/liboctave/ChangeLog	Tue Feb 05 23:11:19 2008 +0000
+++ b/liboctave/ChangeLog	Wed Feb 06 08:27:00 2008 +0000
@@ -1,3 +1,16 @@
+2008-02-06  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in ($(OPTS_INC)): Use mv instead of move-if-change.
+	(stamp-prereq): Eliminate.
+	(clean): Don't remove stamp-prereq.
+	(libraries): Don't depend on stamp-prereq.
+	(PREREQ): New macro.
+	($(MAKEDEPS)): Depend on $(PREREQ), not stamp-prereq.
+	(distclean): Simplify with $(PREREQ).
+	(OPT_BASE): New macro.
+	(OPT_IN): Rename from OPTS_INC_DATA.  Define in terms of OPT_BASE.
+	(OPT_INC): Rename from OPTS_INC.  Define in terms of OPT_BASE.
+
 2008-02-05  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in: Unconditionally include $(MAKEDEPS).
--- a/liboctave/Makefile.in	Tue Feb 05 23:11:19 2008 +0000
+++ b/liboctave/Makefile.in	Wed Feb 06 08:27:00 2008 +0000
@@ -66,10 +66,9 @@
 
 SPARSE_MX_OP_INC := $(shell $(AWK) -f $(srcdir)/sparse-mk-ops.awk prefix=smx list_h_files=1 $(srcdir)/sparse-mx-ops)
 
-OPTS_INC_DATA := DASPK-opts.in DASRT-opts.in DASSL-opts.in \
-	LSODE-opts.in NLEqn-opts.in Quad-opts.in
-
-OPTS_INC := $(OPTS_INC_DATA:.in=.h)
+OPT_BASE := $(addsuffix -opts, DASPK DASRT DASSL LSODE NLEqn Quad)
+OPT_IN := $(addsuffix .in, $(OPT_BASE))
+OPT_INC := $(addsuffix .h, $(OPT_BASE))
 
 INCLUDES := Bounds.h CollocWt.h DAE.h DAEFunc.h DAERT.h \
 	DAERTFunc.h DASPK.h DASRT.h DASSL.h FEGrid.h \
@@ -92,7 +91,7 @@
 	$(MATRIX_INC)
 
 BUILT_INCLUDES := oct-types.h mx-ops.h \
-	$(OPTS_INC) \
+	$(OPT_INC) \
 	$(MX_OP_INC) \
 	$(VX_OP_INC) \
 	$(SPARSE_MX_OP_INC)
@@ -184,7 +183,7 @@
 	$(LIBOCT_READLINE_SOURCES) \
 	$(LIBOCT_PATHSEARCH_SOURCES) \
 	$(LIBOCTAVE_C_SOURCES) \
-	$(INCLUDES) $(EXTRAS) $(OPTS_INC_DATA)) \
+	$(INCLUDES) $(EXTRAS) $(OPT_IN)) \
 	$(BUILT_LIBOCTAVE_CXX_SOURCES) $(BUILT_INCLUDES)
 
 MAKEDEPS_1 := $(patsubst %.cc, %.d, $(SOURCES))
@@ -228,28 +227,21 @@
 	  mkdir pic; \
 	fi
 
-stamp-prereq: $(OPTS_INC) $(VX_OP_INC) $(VX_OP_SRC) \
+PREREQ := $(OPT_INC) $(VX_OP_INC) $(VX_OP_SRC) \
 	$(MX_OP_INC) $(MX_OP_SRC) mx-ops.h \
 	$(SPARSE_MX_OP_INC) $(SPARSE_MX_OP_SRC)
-	touch stamp-prereq
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    libraries: \
-	stamp-prereq \
-	$(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER)
+    libraries: $(LIBPRE)octave.$(LIBEXT) $(LIBPRE)octave.$(SHLEXT_VER)
   else
-    libraries: \
-	stamp-prereq \
-	$(LIBPRE)octave.$(SHLEXT_VER)
+    libraries: $(LIBPRE)octave.$(SHLEXT_VER)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
-    libraries: \
-	stamp-prereq \
-	$(LIBPRE)octave.$(LIBEXT)
+    libraries: $(LIBPRE)octave.$(LIBEXT)
   else
-    libraries: stamp-prereq
+    libraries:
   endif
 endif
 .PHONY: libraries
@@ -270,7 +262,7 @@
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
 
-$(MAKEDEPS): stamp-prereq
+$(MAKEDEPS): $(PREREQ)
 
 check: all
 .PHONY: check
@@ -343,23 +335,21 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile so_locations stamp-prereq oct-types.h $(OPTS_INC)
-	rm -f mx-ops.h $(MX_OP_INC) $(VX_OP_INC) $(MX_OP_SRC) $(VX_OP_SRC)
-	rm -f $(SPARSE_MX_OP_INC) $(SPARSE_MX_OP_SRC)
+	rm -f Makefile so_locations oct-types.h $(PREREQ)
 .PHONY: distclean
 
 maintainer-clean: distclean
 	rm -f tags TAGS
 .PHONY: maintainer-clean
 
-dist: stamp-prereq
+dist: $(PREREQ)
 	ln $(DISTFILES) ../`cat ../.fname`/liboctave
 .PHONY: dist
 
-$(OPTS_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl
+$(OPT_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl
 	@echo making $@ from $<
 	@perl $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@-t
-	@$(simple-move-if-change-rule)
+	@mv $@-t $@
 
 $(VX_OP_INC) $(VX_OP_SRC) : $(srcdir)/mk-ops.awk vx-ops
 	$(AWK) -f $(srcdir)/mk-ops.awk prefix=vx $(srcdir)/vx-ops
--- a/src/ChangeLog	Tue Feb 05 23:11:19 2008 +0000
+++ b/src/ChangeLog	Wed Feb 06 08:27:00 2008 +0000
@@ -1,3 +1,14 @@
+2008-02-06  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (parse.cc : parse.y): Use mv instead of move-if-change.
+	(stamp-prereq, stamp-liboctave-prereq): Eliminate.
+	(clean): Don't remove stamp-prereq and stamp-liboctave-prereq.
+	(OPT_BASE, OPT_IN, OPT_INC): New macros.
+	(OPT_HANDLERS): Define in terms of OPT_BASE.
+	($(OPT_INC) : %.h : %.in): New pattern rule.
+	(PREREQ): New macro.
+	($(MAKEDEPS)): Simplify with $(PREREQ).
+
 2008-02-05  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in: Unconditionally include $(MAKEDEPS).
--- a/src/Makefile.in	Tue Feb 05 23:11:19 2008 +0000
+++ b/src/Makefile.in	Wed Feb 06 08:27:00 2008 +0000
@@ -57,8 +57,10 @@
   endif
 endif
 
-OPT_HANDLERS := DASPK-opts.cc DASRT-opts.cc DASSL-opts.cc \
-	LSODE-opts.cc NLEqn-opts.cc Quad-opts.cc
+OPT_BASE := $(addsuffix -opts, DASPK DASRT DASSL LSODE NLEqn Quad)
+OPT_HANDLERS := $(addsuffix .cc, $(OPT_BASE))
+OPT_IN := $(addprefix ../liboctave/, $(addsuffix .in, $(OPT_BASE)))
+OPT_INC := $(addprefix ../liboctave/, $(addsuffix .h, $(OPT_BASE)))
 
 DLD_XSRC := balance.cc besselj.cc betainc.cc bsxfun.cc cellfun.cc chol.cc \
 	ccolamd.cc colamd.cc colloc.cc conv2.cc convhulln.cc daspk.cc \
@@ -328,9 +330,6 @@
 	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
-stamp-prereq: defaults.h oct-conf.h
-	touch stamp-prereq
-
 octave$(EXEEXT): $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
 	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
 	$(ALL_LDFLAGS) -o $@ \
@@ -399,13 +398,11 @@
 	@$(srcdir)/mkops $(OP_SRC) > $@-t
 	@mv $@-t $@
 
-stamp-liboctave-prereq:
-	$(MAKE) -C ../liboctave stamp-prereq
-	touch stamp-liboctave-prereq
+PREREQ := defaults.h graphics.h oct-conf.h oct-errno.cc oct-gperf.h parse.cc lex.cc 
 
-$(DEF_FILES): stamp-prereq stamp-liboctave-prereq mkdefs
+$(DEF_FILES): $(OPT_INC) mkdefs 
 
-$(MAKEDEPS): stamp-prereq stamp-liboctave-prereq graphics.h oct-gperf.h parse.cc lex.cc $(OPT_HANDLERS)
+$(MAKEDEPS): $(OPT_INC) $(OPT_HANDLERS) $(PREREQ)
 
 check: all
 .PHONY: check
@@ -524,7 +521,7 @@
 
 distclean: clean
 	rm -f Makefile octave$(EXEEXT) .fname so_locations oct-errno.cc
-	rm -f stamp-prereq stamp-liboctave-prereq
+	rm -f stamp-liboctave-prereq
 	rm -f doc-files gendoc.cc graphics.h graphics-props.cc mxarray.h DOCSTRINGS
 .PHONY: distclean
 
@@ -566,7 +563,7 @@
 	@echo "expect 14 shift/reduce conflicts"
 	$(YACC) $(YFLAGS) $<
 	@if [ -s y.tab.c ]; then \
-	  $(top_srcdir)/move-if-change y.tab.c $(@F); \
+	  mv y.tab.c $(@F); \
 	else \
 	  echo "y.tab.c is empty!" 1>&2; \
 	  rm -f y.tab.c; \
@@ -577,6 +574,10 @@
 	$(LEX) $(LFLAGS) $< > $(@F)-t
 	@mv $(@F)-t $@
 
+
+$(OPT_INC) : %.h : %.in
+	$(MAKE) -C $(@D) $@
+
 ## We want to force an update of defaults.h and oct-conf.h every
 ## time make is run because some values may come from the command
 ## line or the environment.  The substitution rules use move-if-change,