X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2FMakefile.am;h=5595e0eed6934b4f416dd110c87c08df2395b961;hb=403b7c14aaf57e3918636344d979a0190a21a4ab;hp=d51e287ad379979fefe7699b0551c44848f07c50;hpb=dc2c437a1a0bd263cb15e8f4240a3607c94e4d44;p=simgear.git

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d51e287a..5595e0ee 100644
--- 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,7 +24,13 @@ 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)
 
@@ -26,69 +38,63 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
 
-if HAVE_FRAMEWORK_PLIB
-tcp_server_LDFLAGS = $(plib_FRAMEWORK)
-else
-tcp_server_PLIB_LIBS = -lplibnet -lplibul
-endif
-
 tcp_server_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(tcp_server_PLIB_LIBS) -lz \
+	-lz \
 	$(network_LIBS) \
+	$(osg_LIBS) \
 	$(base_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
-if HAVE_FRAMEWORK_PLIB
-tcp_client_LDFLAGS = $(plib_FRAMEWORK)
-else
-tcp_client_PLIB_LIBS = -lplibnet -lplibul
-endif
-
 tcp_client_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(tcp_client_PLIB_LIBS) -lz \
+	-lz \
 	$(network_LIBS) \
+	$(osg_LIBS) \
 	$(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
-if HAVE_FRAMEWORK_PLIB
-socktest_LDFLAGS = $(plib_FRAMEWORK)
-else
-socktest_PLIB_LIBS = -lplibnet -lplibul
-endif
-
 socktest_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-        $(socktest_PLIB_LIBS) -lz
+    -lz \
 	$(network_LIBS) \
+	$(osg_LIBS) \
 	$(base_LIBS) 
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(base_LIBS) -lz
+	$(base_LIBS) -lz $(osg_LIBS)
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
 decode_binobj_LDADD = \
 	libsgio.a \
+	$(top_builddir)/simgear/threads/libsgthreads.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(base_LIBS) -lz
+	$(base_LIBS) -lz $(osg_LIBS)