aboutsummaryrefslogtreecommitdiff
path: root/src/clef
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/clef
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/clef')
-rw-r--r--src/clef/Makefile.in8
-rw-r--r--src/clef/edible.c1
2 files changed, 4 insertions, 5 deletions
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index be89672c..65d39a42 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, Gabriel Dos Reis.
+# Copyright (C) 2007-2008, Gabriel Dos Reis.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -39,13 +39,13 @@ clef_SOURCES = edible.c
clef_objects = $(clef_SOURCES:.c=.lo)
-clef_LDADD = $(axiom_target_libdir)/libspad.la
+clef_LDADD = $(axiom_target_libdir)/libspad.la \
+ $(axiom_target_libdir)/libopen-axiom-core.la
+
clef_DEPENDENCIES =
subdir = src/clef/
-pamphlets = Makefile.pamphlet
-
.PHONY: all all-clef
all: all-ax
diff --git a/src/clef/edible.c b/src/clef/edible.c
index bfe76a91..29a1b2fe 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -58,7 +58,6 @@
#include "com.h"
#include "bsdsignal.h"
-#include "bsdsignal.H1"
#include "openpty.H1"
#include "prt.H1"
#include "edin.H1"