Extended .btg format to support a 'points' primitive.

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

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d6d53c4cfdcbeab46d883f88f628a28147836863..b00e24459ca9de0809a47df83024efad4476ed24 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,19 +17,44 @@ libsgio_a_SOURCES = \
        sg_binobj.cxx \
        sg_file.cxx \
        sg_serial.cxx \
-       sg_socket.cxx 
+       sg_socket.cxx \
+       sg_socket_udp.cxx 
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir)
+else
+INCLUDES = -I$(top_srcdir)
+endif
 
-noinst_PROGRAMS = socktest lowtest
+if IS_MINGW
+NETWORK_LIB = -lwsock32
+else
+NETWORK_LIB =
+endif
+
+noinst_PROGRAMS = decode_binobj socktest lowtest
 
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a \
-       $(top_builddir)/simgear/debug/libsgdebug.a
+       $(top_builddir)/simgear/bucket/libsgbucket.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
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-       $(top_builddir)/simgear/io/libsgio.a 
\ No newline at end of file
+       $(top_builddir)/simgear/io/libsgio.a
+
+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