Mac OS X fixes from Markus Morawitz

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index ef61ff85d3773427ddd4685df33a21c3fb05597d..d7149cf8ca73e8a094ed2afd3cd9bf28220ae79d 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -20,17 +20,7 @@ libsgio_a_SOURCES = \
        sg_socket.cxx \
        sg_socket_udp.cxx 
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
-
-if IS_MINGW
-NETWORK_LIB = -lwsock32
-else
-NETWORK_LIB =
-endif
 
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
@@ -39,36 +29,48 @@ tcp_server_SOURCES = tcp_server.cxx
 tcp_server_LDADD = \
        $(top_builddir)/simgear/io/libsgio.a \
        $(top_builddir)/simgear/debug/libsgdebug.a \
-       -lplibnet
+       $(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 \
-       -lplibnet
+       $(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/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       $(top_builddir)/simgear/xml/libsgxml.a \
-       -lplibnet -lz
+       -lplibnet -lplibul -lz \
+       $(network_LIBS) \
+       $(base_LIBS)
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a
+       $(top_builddir)/simgear/io/libsgio.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 \
-       $(NETWORK_LIB) -lz
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(top_builddir)/simgear/bucket/libsgbucket.a \
+       $(top_builddir)/simgear/misc/libsgmisc.a \
+       $(base_LIBS) -lz