X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2FMakefile.am;h=566af470612c61a2004c4ac5df1093c06ea0c024;hb=9f88b077ee5294c4ad898016b7d66682466bbafb;hp=ef61ff85d3773427ddd4685df33a21c3fb05597d;hpb=761b7b93543ad2e8dfd307ee3679b3a2a7082ddc;p=simgear.git

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index ef61ff85..566af470 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -9,7 +9,11 @@ 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
 
 libsgio_a_SOURCES = \
 	iochannel.cxx \
@@ -18,57 +22,67 @@ 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
 
-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
 
 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 \
-	-lplibnet
+	$(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 = \
-	$(top_builddir)/simgear/io/libsgio.a \
+	libsgio.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
-	-lplibnet
+	$(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 \
-	-lplibnet -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 \
-	$(NETWORK_LIB) -lz
+	libsgio.a \
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(top_builddir)/simgear/bucket/libsgbucket.a \
+	$(top_builddir)/simgear/misc/libsgmisc.a \
+	$(base_LIBS) -lz