From ebd9e5076b7cdf3b7e5619db2dce499ede29e1fe Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 15 Mar 2008 11:19:32 +0000 Subject: * 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. --- src/graph/view2D/Makefile.in | 3 ++- src/graph/view2D/main2d.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/graph/view2D') 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" -- cgit v1.2.3