# HG changeset patch
# User jwe
# Date 823923115 0
# Node ID 8637abd0da0b2a91905fac8e84d1fb1ba32f551e
# Parent  a5dfd2014993e1aa9b364cbc813a93395dd4f63f
[project @ 1996-02-10 03:26:34 by jwe]

diff -r a5dfd2014993 -r 8637abd0da0b libcruft/Makefile.in
--- 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
diff -r a5dfd2014993 -r 8637abd0da0b libcruft/misc/Makefile.in
--- 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))
 
diff -r a5dfd2014993 -r 8637abd0da0b libcruft/misc/f77-extern.cc
--- 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++ ***
diff -r a5dfd2014993 -r 8637abd0da0b libcruft/misc/lo-error.cc
--- 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)
 {
diff -r a5dfd2014993 -r 8637abd0da0b liboctave/Makefile.in
--- 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) \