Bernie Bright:

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 0f84bf1b25f43d0db8ce492064d34d4467cf41b5..ef61ff85d3773427ddd4685df33a21c3fb05597d 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -8,7 +8,8 @@ include_HEADERS = \
        sg_binobj.hxx \
        sg_file.hxx \
        sg_serial.hxx \
-       sg_socket.hxx
+       sg_socket.hxx \
+       sg_socket_udp.hxx
 
 libsgio_a_SOURCES = \
        iochannel.cxx \
@@ -16,11 +17,36 @@ libsgio_a_SOURCES = \
        sg_binobj.cxx \
        sg_file.cxx \
        sg_serial.cxx \
-       sg_socket.cxx 
+       sg_socket.cxx \
+       sg_socket_udp.cxx 
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir)
+else
+INCLUDES = -I$(top_srcdir)
+endif
 
-noinst_PROGRAMS = decode_binobj socktest lowtest
+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 \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       -lplibnet
+
+tcp_client_SOURCES = tcp_client.cxx
+
+tcp_client_LDADD = \
+       $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       -lplibnet
 
 socktest_SOURCES = socktest.cxx
 
@@ -29,7 +55,8 @@ socktest_LDADD = \
         $(top_builddir)/simgear/io/libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       -lz
+       $(top_builddir)/simgear/xml/libsgxml.a \
+       -lplibnet -lz
 
 lowtest_SOURCES = lowtest.cxx
 
@@ -42,4 +69,6 @@ decode_binobj_LDADD = \
        $(top_builddir)/simgear/io/libsgio.a \
         $(top_builddir)/simgear/bucket/libsgbucket.a \
         $(top_builddir)/simgear/misc/libsgmisc.a \
-        -lz
\ No newline at end of file
+        $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/xml/libsgxml.a \
+       $(NETWORK_LIB) -lz