diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-10-25 03:21:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-10-25 03:21:55 +0000 |
| commit | a3dccc344e57259f113b7f2d7e2761ad8131e60b (patch) | |
| tree | 6cd6ea55fdfa2470c08355321af49cd650ca5963 /src/etc | |
| parent | ca39f5ae7631e3bedf6114f7ebe7dfa2a8579f76 (diff) | |
| download | open-axiom-a3dccc344e57259f113b7f2d7e2761ad8131e60b.tar.gz | |
* interp/sys-os.boot: Import oa_socket_read_byte as
readByteFromStreamSocket. Import oa_socket_write_byte as
writeByteToStreamSocket.
* include/sockio.h (oa_socket_read_byte): Declare.
(oa_socket_write_byte): Likewise.
* lib/sockio-c.c (oa_socket_read_byte): Define.
(oa_socket_write_byte): Likewise.
* algebra/net.spad.pamphlet (readByteIfCan!$InetClientStreamSocket):
Implement.
(writeByteIfCan!$InetClientStreamSocket): Likewise.
* etc/asq.c.pamphlet: Update build rules for asq$(EXEEXT).
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/Makefile.in | 10 | ||||
| -rw-r--r-- | src/etc/asq.c.pamphlet | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in index f34168cc..13510516 100644 --- a/src/etc/Makefile.in +++ b/src/etc/Makefile.in @@ -43,6 +43,12 @@ subdir = src/etc/ pamphlets = Makefile.pamphlet $(asq_SOURCES) +build_libdir = $(top_builddir)/src/lib + +libspad_la = -L$(build_libdir) -lspad + +openaxiom_c_libs = -lopen-axiom-core @axiom_c_runtime_extra@ -lm + .PHONY: all all-asq all: all-ax @@ -81,10 +87,12 @@ bin_PROGRAMS = asq$(EXEEXT) asq_sources = asq.c asq_SOURCES = $(addsuffix .pamphlet, $(asq_sources)) asq_objects = $(asq_sources:.c=.$(OBJEXT)) +asq_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) $(axiom_target_bindir)/asq$(EXEEXT): asq.c $(axiom_c_macros_h) @echo making $@ from $< - ${CC} ${CCF} $(axiom_includes) -o asq$(EXEEXT) asq.c + ${CC} ${CCF} $(axiom_includes) -o asq$(EXEEXT) asq.c \ + $(asq_LDADD) cp -p asq$(EXEEXT) $(axiom_target_bindir) asq.c: $(srcdir)/asq.c.pamphlet diff --git a/src/etc/asq.c.pamphlet b/src/etc/asq.c.pamphlet index 19277b5c..034c35d3 100644 --- a/src/etc/asq.c.pamphlet +++ b/src/etc/asq.c.pamphlet @@ -530,6 +530,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <string.h> #include "openaxiom-c-macros.h" +#include "cfuns.h" /* we need to predeclare some functions so their signatures are known */ int printandor(char *list); |