aboutsummaryrefslogtreecommitdiff
path: root/src/graph/viewman
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-03-15 11:19:32 +0000
committerdos-reis <gdr@axiomatics.org>2008-03-15 11:19:32 +0000
commitebd9e5076b7cdf3b7e5619db2dce499ede29e1fe (patch)
treeab2d157e86d37d5e65701295f47cecaf06032fac /src/graph/viewman
parent128d66db542368fd7abe54cc10427b0225c91862 (diff)
downloadopen-axiom-ebd9e5076b7cdf3b7e5619db2dce499ede29e1fe.tar.gz
* 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.
Diffstat (limited to 'src/graph/viewman')
-rw-r--r--src/graph/viewman/Makefile.in3
-rw-r--r--src/graph/viewman/sselect.c1
-rw-r--r--src/graph/viewman/viewman.c1
3 files changed, 2 insertions, 3 deletions
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"