diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-03-15 11:19:32 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-03-15 11:19:32 +0000 |
| commit | ebd9e5076b7cdf3b7e5619db2dce499ede29e1fe (patch) | |
| tree | ab2d157e86d37d5e65701295f47cecaf06032fac /src/hyper | |
| parent | 128d66db542368fd7abe54cc10427b0225c91862 (diff) | |
| download | open-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/hyper')
| -rw-r--r-- | src/hyper/Makefile.in | 3 | ||||
| -rw-r--r-- | src/hyper/htinp.c | 1 | ||||
| -rw-r--r-- | src/hyper/hyper.c | 2 | ||||
| -rw-r--r-- | src/hyper/spadbuf.c | 1 | ||||
| -rw-r--r-- | src/hyper/spadint.c | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index 7f976173..45f22ac1 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -68,7 +68,8 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \ parse-paste.c parse-types.c ReadBitmap.c scrollbar.c \ show-types.c spadint.c titlebar.c -libspad_la = $(axiom_target_libdir)/libspad.la +libspad_la = $(axiom_target_libdir)/libspad.la \ + $(axiom_target_libdir)/libopen-axiom-core.la hypertex_objects = $(hypertex_SOURCES:.c=.lo) hypertex_LDADD = $(libspad_la) diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c index 5c129de8..2e43a6e4 100644 --- a/src/hyper/htinp.c +++ b/src/hyper/htinp.c @@ -50,7 +50,6 @@ #include "all_hyper_proto.H1" #include "sockio.h" -#include "bsdsignal.H1" extern char **input_file_list; extern int input_file_count; diff --git a/src/hyper/hyper.c b/src/hyper/hyper.c index 1b71b76e..ef00c891 100644 --- a/src/hyper/hyper.c +++ b/src/hyper/hyper.c @@ -64,7 +64,7 @@ #include "all_hyper_proto.H1" #include "sockio.h" -#include "bsdsignal.H1" + /* * Here is a flag used to tell me whether I made a good connection to the * menu server. Needed so I don't send spad commands when I should not diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c index 42b3f482..f67c1519 100644 --- a/src/hyper/spadbuf.c +++ b/src/hyper/spadbuf.c @@ -57,7 +57,6 @@ #include "com.h" #include "spadbuf.H1" -#include "bsdsignal.H1" #include "sockio.h" #include "edin.H1" #include "wct.H1" diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c index da149b8d..8969ab34 100644 --- a/src/hyper/spadint.c +++ b/src/hyper/spadint.c @@ -49,7 +49,6 @@ #include "all_hyper_proto.H1" #include "sockio.h" -#include "bsdsignal.H1" typedef struct sock_list { /* linked list of Sock */ |