* configure.ac.pamphlet (axiom_c_runtime): Don't include core, as

	it is always built into libopen-axiom-core.
src/
	* include/cfuns.h (findString): Rename from include/cfuns-c.H1.
	Make DLL-aware.
	* include/open-axiom.h: New.
	* include/sockio.h: Make DLL-aware.
	* include/bsdsignal.H1: Fold content into include/bsdsignal.h.
	Remove.
	* lib/bsdsignal.c: Don't include bsdsignal.H1
	* lib/fnct_key.c: Likewise.
	* lib/sockio-c.c: Likewise.
	* lib/Makefile.in (other_SOURCES): Remove.
	(other_objects): Likewise.
	(pamphlets): Likewise.
	(clean-local): Don't remove source files.
	(libopen_axiom_core_la_SOURCES): New.
	(libopen_axiom_core_la_objects): Likewise.
	(stamp): Require $(axiom_target_libdir)/libopen-axiom-core.la too.
	* graph/view2D/main2d.c: Likewise.
	* clef/edible.c: Likewise.
	* graph/view3D/main3d.c: Likewise.
	* graph/view3D/testcol.c: Likewise.
	* graph/viewman/sselect.c: Likewise.
	* graph/viewman/viewman.c: Likewise.
	* hyper/htinp.c: Likewise.
	* hyper/hyper.c: Likewise.
	* hyper/spadbuf.c: Likewise.
	* hyper/spadint.c: Likewise.
	* sman/session.c: Likewise.
	* sman/sman.c: Likewise.
	* sman/spadclient.c: Likewise.

9 files changed, 8 insertions, 9 deletions

diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index 905d8179..cc9b80cf 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -48,7 +48,8 @@ view2D_objects = $(view2D_SOURCES:.c=.lo)
 
 Gfun_objects = ../Gdraws/Gfun.lo
 
-view2D_LDADD = $(axiom_target_libdir)/libspad.la
+view2D_LDADD = $(axiom_target_libdir)/libspad.la \
+		$(axiom_target_libdir)/libopen-axiom-core.la
 
 view2D_DEPENDENCIES = $(Gfun_objects)
 
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 8ff6b8e7..c7ade472 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -45,7 +45,6 @@
 #include "header2.h"
 #include "bsdsignal.h"
 #include "globals2.h"
-#include "bsdsignal.H1"
 #include "all_2d.H1"
 #include "Gfun.H1"
 #include "util.H1"
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index e8fc9f44..edd6a2e9 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -57,7 +57,8 @@ view3D_objects = $(addprefix $(builddir)/, $(view3D_SOURCES:.c=.lo))
 Gfun_objects = ../Gdraws/Gfun.lo
 
 
-view3D_LDADD = $(axiom_target_libdir)/libspad.la
+view3D_LDADD = $(axiom_target_libdir)/libspad.la \
+		$(axiom_target_libdir)/libopen-axiom-core.la
 view3D_DEPENDENCIES = $(Gfun_objects)
 
 subdir = src/graph/view3D/
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index 2197538e..7929199b 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -47,7 +47,6 @@
 #include "process.h"
 #include "bsdsignal.h"
 
-#include "bsdsignal.H1"
 #include "util.H1"
 #include "Gfun.H1"
 #include "XSpadFill.H1"
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index ee61574e..a48cb9c8 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -47,7 +47,6 @@
 #include "process.h"
 #include "bsdsignal.h"
 
-#include "bsdsignal.H1"
 #include "util.H1"
 #include "Gfun.H1"
 #include "XSpadFill.H1"
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index 7cb466fa..a5b12473 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -44,7 +44,8 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c
 
 viewAlone_objects = $(viewAlone_SOURCES:.c=.lo)
 
-viewAlone_LDADD = $(axiom_target_libdir)/libspad.la
+viewAlone_LDADD = $(axiom_target_libdir)/libspad.la \
+		$(axiom_target_libdir)/libopen-axiom-core.la
 viewAlone_DEPENDENCIES =
 
 subdir = src/graph/viewAlone/
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index cc857bc6..066ff0a5 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -53,7 +53,8 @@ viewman_headers = $(srcdir)/viewman.h \
 
 
 viewman_DEPENDENCIES =
-viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la
+viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la \
+		$(axiom_target_libdir)/libopen-axiom-core.la
 
 subdir = src/graph/viewman/
 
diff --git a/src/graph/viewman/sselect.c b/src/graph/viewman/sselect.c
index 1cb584c5..a9b16528 100644
--- a/src/graph/viewman/sselect.c
+++ b/src/graph/viewman/sselect.c
@@ -46,7 +46,6 @@
 #include "bsdsignal.h"
 
 #include "sockio.h"
-#include "bsdsignal.H1"
 #include "cleanup.H1"
 #include "sselect.H1"
 
diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c
index 63136731..441d0f7a 100644
--- a/src/graph/viewman/viewman.c
+++ b/src/graph/viewman/viewman.c
@@ -53,7 +53,6 @@
 #include "bsdsignal.h"
 
 
-#include "bsdsignal.H1"
 #include "util.H1"
 #include "sockio.h"
 #include "fun2D.H1"