remove old .cvsignore files

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d51e287ad379979fefe7699b0551c44848f07c50..566af470612c61a2004c4ac5df1093c06ea0c024 100644 (file)
--- 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,7 +22,11 @@ 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
 
 INCLUDES = -I$(top_srcdir)
 
@@ -26,52 +34,37 @@ 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/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       $(tcp_server_PLIB_LIBS) -lz \
+       -lz \
        $(network_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/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-       $(tcp_client_PLIB_LIBS) -lz \
+       -lz \
        $(network_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/debug/libsgdebug.a \
        $(top_builddir)/simgear/bucket/libsgbucket.a \
        $(top_builddir)/simgear/misc/libsgmisc.a \
-        $(socktest_PLIB_LIBS) -lz
+    -lz \
        $(network_LIBS) \
        $(base_LIBS) 
 
@@ -79,6 +72,7 @@ lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
        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 \