Revert "Support non-blocking address lookups, and switch to getaddrinfo over gethostb...

[simgear.git] / simgear / io / Makefile.am

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index c6af48970d66cbf1af29c7843e6b0f657d80cb71..760676a36dee8e12884029e097ddc245eec6f950 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -9,7 +9,13 @@ include_HEADERS = \
        sg_file.hxx \
        sg_serial.hxx \
        sg_socket.hxx \
-       sg_socket_udp.hxx
+       sg_socket_udp.hxx \
+       raw_socket.hxx  \
+       sg_netBuffer.hxx \
+       sg_netChannel.hxx \
+       sg_netChat.hxx \
+       HTTPClient.hxx \
+       HTTPRequest.hxx
 
 libsgio_a_SOURCES = \
        iochannel.cxx \
@@ -18,37 +24,69 @@ libsgio_a_SOURCES = \
        sg_file.cxx \
        sg_serial.cxx \
        sg_socket.cxx \
-       sg_socket_udp.cxx 
+       sg_socket_udp.cxx \
+       raw_socket.cxx \
+       sg_netBuffer.cxx \
+       sg_netChannel.cxx \
+       sg_netChat.cxx \
+       HTTPClient.cxx \
+       HTTPRequest.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
 
-noinst_PROGRAMS = decode_binobj socktest lowtest
+noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
+
+tcp_server_SOURCES = tcp_server.cxx
+
+tcp_server_LDADD = \
+       libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
+
+tcp_client_SOURCES = tcp_client.cxx
+
+tcp_client_LDADD = \
+       libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
-       $(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/io/libsgio.a \
+       libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       $(top_builddir)/simgear/xml/libsgxml.a \
-       -lz
+    -lz \
+       $(network_LIBS) \
+       $(base_LIBS) 
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a
+       libsgio.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(base_LIBS) -lz
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
 decode_binobj_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
-        $(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/misc/libsgmisc.a \
-        $(top_builddir)/simgear/debug/libsgdebug.a \
-       $(top_builddir)/simgear/xml/libsgxml.a \
-        -lz
+       libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(base_LIBS) -lz