New automake, new problems. Use $base_LIBS where $LIBS was automatically added before

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 70dbab83c179996f4220b6d49183e5bc284c4499..c4d5b58dc481f008182ab8ca7b16db694c8ee8ca 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,21 +17,45 @@ libsgio_a_SOURCES = \
        sg_binobj.cxx \
        sg_file.cxx \
        sg_serial.cxx \
-       sg_socket.cxx 
+       sg_socket.cxx \
+       sg_socket_udp.cxx 
 
-INCLUDES += -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
 
-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 = \
+       $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       -lplibnet -lplibul -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
+
+tcp_client_SOURCES = tcp_client.cxx
+
+tcp_client_LDADD = \
+       $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       -lplibnet -lplibul -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/io/libsgio.a \
+       $(top_builddir)/simgear/io/libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       $(top_builddir)/simgear/xml/libsgxml.a \
-       -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
 
 lowtest_SOURCES = lowtest.cxx
 
@@ -41,8 +66,7 @@ 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
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(base_LIBS) -lz