Mercurial > octave-nkf

changeset 3615:c3b1f34a4748

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-03-21 08:19:19 by jwe]
author jwe
date Tue, 21 Mar 2000 08:19:21 +0000
parents b1b831947caa
children 1b5178224a25
files ChangeLog Makeconf.in configure.in libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in
diffstat 10 files changed, 127 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 17 11:10:34 2000 +0000
+++ b/ChangeLog	Tue Mar 21 08:19:21 2000 +0000
@@ -1,3 +1,13 @@
+2000-03-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (liboctave.$(SHLEXT)): Delete target before rebuilding.
+
+2000-03-21  Ben Sapp <bsapp@nua.lampf.lanl.gov>:
+
+	* Makeconf.in (%.o : %.c): Pass -o to compile command.
+	(%.o : %.cc): Ditto.
+	* configure.in (%.o : %.f): Ditto.
+
 2000-03-08  Stephen Eglen  <stephen@gnu.org>
 
 	* emacs/octave-mod.el (octave-font-lock-keywords): To font-lock
--- a/Makeconf.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/Makeconf.in	Tue Mar 21 08:19:21 2000 +0000
@@ -279,10 +279,10 @@
 # How to make .o files:
 
 %.o : %.c
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@
 
 %.o : %.cc
-	$(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $<
+	$(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@
 
 pic/%.o : %.c
 	$(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@
--- a/configure.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/configure.in	Tue Mar 21 08:19:21 2000 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.324 $)
+AC_REVISION($Revision: 1.325 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -427,7 +427,7 @@
 %.c : %.f
 
 %.o : %.f
-	$(FC) -c $(ALL_FFLAGS) $<
+	$(FC) -c $(ALL_FFLAGS) -o $@ $<
 
 pic/%.o : %.f
 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
--- a/libcruft/ChangeLog	Fri Mar 17 11:10:34 2000 +0000
+++ b/libcruft/ChangeLog	Tue Mar 21 08:19:21 2000 +0000
@@ -1,3 +1,16 @@
+2000-03-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (libcruft.$(LIBEXT)): New target.
+	(all): Depend on `libraries', not `$(SUBDIRS) shared-lib'.
+	Conditionally construct `libraries' target.
+	(libcruft.$(SHLEXT_VER)): Delete target before rebuilding.
+	* Makerules.in (LIBCRUFT): Delete variable.
+	(LIBCRUFT_DEPEND): Conditionally define to $(LIBCRUFT_OBJS) only.
+	(all): Print warning if anything is done.
+	(stmp-pic): New target.
+	($CRUFT_PICOBJ): Depend on stmp-pic.
+	(clean, mostlyclean): Remove pic and stmp-pic.
+
 2000-02-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lapack/dbdsqr.f, lapack/dgeesv.f, lapack/dgelss.f,
--- a/libcruft/Makefile.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/libcruft/Makefile.in	Tue Mar 21 08:19:21 2000 +0000
@@ -36,7 +36,7 @@
   BINDISTFILES = libcruft.$(SHLEXT_VER)
 endif
 
-all: $(SUBDIRS) shared-lib
+all: libraries
 .PHONY: all
 
 $(SUBDIRS):
@@ -67,17 +67,31 @@
 endif
 
 ifeq ($(SHARED_LIBS), true)
-shared-lib: libcruft.$(SHLEXT)
+  ifeq ($(STATIC_LIBS), true)
+    libraries: $(SUBDIRS) libcruft.$(LIBEXT) libcruft.$(SHLEXT)
+  else
+    libraries: $(SUBDIRS) libcruft.$(SHLEXT)
+  endif
 else
-shared-lib:
+  ifeq ($(STATIC_LIBS), true)
+    libraries: $(SUBDIRS) libcruft.$(LIBEXT)
+  else
+    libraries:
+  endif
 endif
-.PHONY: shared-lib
+.PHONY: libraries
+
+libcruft.$(LIBEXT): $(CRUFT_OBJ)
+	rm -f $@
+	$(AR) $(ARFLAGS) $@ $^
+	$(RANLIB) $@
 
 libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER)
 	rm -f $@
 	$(LN_S) $< $@
 
 libcruft.$(SHLEXT_VER): $(CRUFT_PICOBJ)
+	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^
 
 $(CRUFT_OBJ):
--- a/libcruft/Makerules.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/libcruft/Makerules.in	Tue Mar 21 08:19:21 2000 +0000
@@ -31,21 +31,26 @@
 CWD = $(shell pwd)
 THISDIR = $(notdir $(CWD))
 
-LIBCRUFT := ../libcruft.$(LIBEXT)
-
 LIBCRUFT_OBJS = $(CRUFT_OBJ) $(SPECIAL_DEPEND)
 
-LIBCRUFT_DEPS = $(LIBCRUFT)($(LIBCRUFT_OBJS))
-
 ifeq ($(STATIC_LIBS), true)
-  LIBCRUFT_DEPEND := $(LIBCRUFT_DEPS)
+  LIBCRUFT_DEPEND := $(LIBCRUFT_OBJS)
 endif
 
 all: pic $(LIBCRUFT_DEPEND) $(CRUFT_PICOBJ) $(SPECIAL_PICDEPEND)
+	@echo "warning: run make in parent directory to update libraries"
 .PHONY: all
 
 .PRECIOUS: $(LIBCRUFT_OBJS)
 
+stmp-pic: pic
+	@if [ -f stmp-pic ]; then \
+	  true; \
+	else \
+	  echo "touch stmp-pic"; \
+	  touch stmp-pic; \
+	fi
+
 pic:
 	@if [ -d pic ]; then \
 	  true; \
@@ -54,6 +59,8 @@
 	  mkdir pic; \
 	fi
 
+$(CRUFT_PICOBJ): stmp-pic
+
 install:: all
 .PHONY: install
 
@@ -68,15 +75,18 @@
 
 clean::
 	rm -f *.a *.o pic/*.o
+	-rmdir pic
+	rm -f stmp-pic
 .PHONY: clean
 
 mostlyclean::
 	rm -f *.o pic/*.o
+	-rmdir pic
+	rm -f stmp-pic
 .PHONY: mostlyclean
 
 distclean:: clean
 	rm -f Makefile
-	-rmdir pic
 .PHONY: distclean
 	
 maintainer-clean:: distclean
--- a/liboctave/ChangeLog	Fri Mar 17 11:10:34 2000 +0000
+++ b/liboctave/ChangeLog	Tue Mar 21 08:19:21 2000 +0000
@@ -1,3 +1,13 @@
+2000-03-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (liboctave.$(SHLEXT)): Delete target
+	before rebuilding.
+
+2000-03-21  Ben Sapp <bsapp@nua.lampf.lanl.gov>:
+
+	* liboctave/Makefile.in (liboctave.$(LIBEXT)): New target.
+	(libraries): Depend only on library targets, not archive members.
+
 2000-03-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in: (objects): New target.
--- a/liboctave/Makefile.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/liboctave/Makefile.in	Tue Mar 21 08:19:21 2000 +0000
@@ -148,24 +148,30 @@
 
 ifeq ($(SHARED_LIBS), true)
   ifeq ($(STATIC_LIBS), true)
-    libraries: liboctave.$(LIBEXT)($(OBJECTS)) liboctave.$(SHLEXT)
+    libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT)
   else
     libraries: liboctave.$(SHLEXT)
   endif
 else
   ifeq ($(STATIC_LIBS), true)
-    libraries: liboctave.$(LIBEXT)($(OBJECTS))
+    libraries: liboctave.$(LIBEXT)
   else
     libraries:
   endif
 endif
 .PHONY: libraries
 
+liboctave.$(LIBEXT): $(OBJECTS)
+	rm -f $@
+	$(AR) $(ARFLAGS) $@ $^
+	$(RANLIB) $@
+
 liboctave.$(SHLEXT): liboctave.$(SHLEXT_VER)
 	rm -f $@
 	$(LN_S) $< $@
 
 liboctave.$(SHLEXT_VER): $(PICOBJ)
+	rm -f $@
 	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^
 
 $(PICOBJ): stmp-pic
--- a/src/ChangeLog	Fri Mar 17 11:10:34 2000 +0000
+++ b/src/ChangeLog	Tue Mar 21 08:19:21 2000 +0000
@@ -1,3 +1,18 @@
+2000-03-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* src/Makefile.in (LIBRARIES): Conditionally define.
+	(libraries): Depend on $(LIBRARIES).
+	(octave): Depend on $(LIBRARIES), not libraries.  Also depend on
+	stamp-prereq and stamp-oct-links.
+	(all): Don't depend on stamp-prereq or stamp-oct-links.
+	(liboctinterp.$(LIBEXT), liboctinterp.$(SHELXT)): Delete target
+	before rebuilding.
+
+2000-03-21  Ben Sapp <bsapp@nua.lampf.lanl.gov>:
+
+	* src/Makefile.in (libraries): Depend only on library targets, not
+	archive members.
+
 2000-03-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (objects): New target
--- a/src/Makefile.in	Fri Mar 17 11:10:34 2000 +0000
+++ b/src/Makefile.in	Tue Mar 21 08:19:21 2000 +0000
@@ -203,11 +203,41 @@
   BINDISTFILES = octave $(OCT_FILES)
 endif
 
-all: stamp-prereq libraries stamp-oct-links octave DOCSTRINGS
+all: octave DOCSTRINGS
 .PHONY: all
 
 objects: $(OBJECTS)
 
+ifeq ($(SHARED_LIBS), true)
+  ifeq ($(STATIC_LIBS), true)
+    LIBRARIES = liboctinterp.$(LIBEXT) liboctinterp.$(SHLEXT)
+  else
+    LIBRARIES = liboctinterp.$(SHLEXT)
+  endif
+else
+  ifeq ($(STATIC_LIBS), true)
+    LIBRARIES = liboctinterp.$(LIBEXT)
+  else
+    LIBRARIES =
+  endif
+endif
+
+libraries: $(LIBRARIES)
+.PHONY: libraries
+
+liboctinterp.$(LIBEXT): $(OBJECTS)
+	rm -f $@
+	$(AR) $(ARFLAGS) $@ $^
+	$(RANLIB) $@
+
+liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER)
+	rm -f $@
+	$(LN_S) $< $@
+
+liboctinterp.$(SHLEXT_VER): $(PICOBJ)
+	rm -f $@
+	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^
+
 stamp-oct-links: $(OCT_FILES)
 	if [ -n "$(OCT_FILES)" ]; then \
 	  $(srcdir)/mk-oct-links . $(addprefix $(srcdir)/, $(DLD_SRC)); \
@@ -217,7 +247,8 @@
 stamp-prereq: defaults.h oct-conf.h
 	touch stamp-prereq
 
-octave: octave.o builtins.o ops.o $(DLD_STATIC_OBJ) libraries
+octave: stamp-prereq $(LIBRARIES) stamp-oct-links \
+	octave.o builtins.o ops.o $(DLD_STATIC_OBJ)
 	$(CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
 	$(ALL_LDFLAGS) -o octave \
 	octave.o builtins.o ops.o $(DLD_STATIC_OBJ) \
@@ -241,32 +272,6 @@
 	  mkdir pic; \
 	fi
 
-ifeq ($(SHARED_LIBS), true)
-  ifeq ($(STATIC_LIBS), true)
-    libraries: liboctinterp.$(LIBEXT)($(OBJECTS)) liboctinterp.$(SHLEXT)
-  else
-    libraries: liboctinterp.$(SHLEXT)
-  endif
-else
-  ifeq ($(STATIC_LIBS), true)
-    libraries: liboctinterp.$(LIBEXT)($(OBJECTS))
-  else
-    libraries:
-  endif
-endif
-.PHONY: libraries
-
-liboctinterp.$(LIBEXT): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-	$(RANLIB) $@
-
-liboctinterp.$(SHLEXT): liboctinterp.$(SHLEXT_VER)
-	rm -f $@
-	$(LN_S) $< $@
-
-liboctinterp.$(SHLEXT_VER): $(PICOBJ)
-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^
-
 $(PICOBJ): stmp-pic
 
 builtins.cc: $(DEF_FILES) mkbuiltins