Async lookup attempt #3 - use OpenThreads instead - I'm going to kill off SGThread...

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 9cf9c3a251c2b27b5bc80e1766b1b2069ad6bcac..e0086d86624fdf1e9e20be6705b945b254167598 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,59 +24,72 @@ 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
 
 INCLUDES = -I$(top_srcdir)
 
-if IS_MINGW
-NETWORK_LIB = -lwsock32
-else
-NETWORK_LIB =
-endif
-
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
 
 tcp_server_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 \
-       $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lplibul -lz $(NETWORK_LIB)
+       -lz \
+       $(network_LIBS) \
+       $(osg_LIBS) \
+       $(base_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
 tcp_client_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 \
-        $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lplibul -lz $(NETWORK_LIB)
+       -lz \
+       $(network_LIBS) \
+       $(osg_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 \
-       -lplibnet -lplibul -lz $(NETWORK_LIB)
+    -lz \
+       $(network_LIBS) \
+       $(osg_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 $(osg_LIBS)
 
 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 $(osg_LIBS)