Mercurial > octave-nkf
changeset 1914:8637abd0da0b
[project @ 1996-02-10 03:26:34 by jwe]
| author | jwe |
|---|---|
| date | Sat, 10 Feb 1996 03:31:55 +0000 |
| parents | a5dfd2014993 |
| children | 3408d64a32ca |
| files | libcruft/Makefile.in libcruft/misc/Makefile.in libcruft/misc/f77-extern.cc libcruft/misc/lo-error.cc liboctave/Makefile.in |
| diffstat | 5 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/Makefile.in Sat Feb 10 03:23:05 1996 +0000 +++ b/libcruft/Makefile.in Sat Feb 10 03:31:55 1996 +0000 @@ -40,11 +40,13 @@ cd $@; $(MAKE) all .PHONY: $(SUBDIRS) +MISC_OBJ := misc/d1mach.o misc/dostop.o misc/f77-extern.o misc/lo-error.o + CRUFT_FSRC := $(foreach dir, $(SUBDIRS), $(wildcard $(srcdir)/$(dir)/*.f)) CRUFT_OBJ3 := $(patsubst $(srcdir)/%, %, $(CRUFT_FSRC)) CRUFT_OBJ2 := $(patsubst %.f, %.o, $(CRUFT_OBJ3)) CRUFT_OBJ1 := $(subst misc/d1mach.o, , $(CRUFT_OBJ2)) -CRUFT_OBJ := $(CRUFT_OBJ1) misc/d1mach.o misc/dostop.o misc/misc-extern.o +CRUFT_OBJ := $(CRUFT_OBJ1) $(MISC_OBJ) ifeq ($(SHARED_LIBS), true) ifdef FPICFLAG
--- a/libcruft/misc/Makefile.in Sat Feb 10 03:23:05 1996 +0000 +++ b/libcruft/misc/Makefile.in Sat Feb 10 03:31:55 1996 +0000 @@ -12,9 +12,9 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -SPECIAL = gen-d1mach.c d1mach-tst.for dostop.c misc-extern.cc +SPECIAL = gen-d1mach.c d1mach-tst.for dostop.c f77-extern.cc lo-error.cc -SPECIAL_DEPEND = d1mach.o dostop.o misc-extern.o +SPECIAL_DEPEND = d1mach.o dostop.o f77-extern.o lo-error.o DISTFILES = $(subst d1mach.f, , $(DISTFILES))
--- a/libcruft/misc/f77-extern.cc Sat Feb 10 03:23:05 1996 +0000 +++ b/libcruft/misc/f77-extern.cc Sat Feb 10 03:31:55 1996 +0000 @@ -37,9 +37,6 @@ // For setjmp/longjmp. jmp_buf f77_context; -// Pointer to the current error handling function. -liboctave_error_handler current_liboctave_error_handler = liboctave_fatal; - /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/libcruft/misc/lo-error.cc Sat Feb 10 03:23:05 1996 +0000 +++ b/libcruft/misc/lo-error.cc Sat Feb 10 03:31:55 1996 +0000 @@ -1,4 +1,4 @@ -// error.cc -*- C++ -*- +//lo-error.cc -*- C++ -*- /* Copyright (C) 1996 John W. Eaton @@ -31,6 +31,12 @@ #include "lo-error.h" +// Having this file in this directory is a kluge to avoid unresolved +// symbol errors when creating shared versions of libcruft. + +// Pointer to the current error handling function. +liboctave_error_handler current_liboctave_error_handler = liboctave_fatal; + static void verror (const char *name, const char *fmt, va_list args) {
--- a/liboctave/Makefile.in Sat Feb 10 03:23:05 1996 +0000 +++ b/liboctave/Makefile.in Sat Feb 10 03:31:55 1996 +0000 @@ -59,7 +59,7 @@ LinConst.cc LPsolve.cc LSODE.cc NLEqn.cc NPSOL.cc QPSOL.cc \ Quad.cc Range.cc acosh.c asinh.c atanh.c cmd-hist.cc \ dir-ops.cc erf.c erfc.c f77-fcn.c file-ops.cc filemode.c \ - gamma.c getopt.c getopt1.c idx-vector.cc lo-error.cc lgamma.c \ + gamma.c getopt.c getopt1.c idx-vector.cc lgamma.c \ mkdir.c oct-glob.cc oct-term.cc pathsearch.cc prog-args.cc \ rename.c rmdir.c str-vec.cc sun-utils.cc tempname.c tempnam.c \ $(TEMPLATE_SRC) \