FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next' of git.gitorious.org:fg/simgear into next

Browse Source
This commit is contained in:
Martin Spott
2011-09-26 11:18:56 +02:00
parent 25918b8b76 c925c02e69
commit 1a46974cb9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/io/Makefile.am
View File

@@ -47,7 +47,7 @@ tcp_server_LDADD = \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lz \
$(network_LIBS) \
$(osg_LIBS) \
$(osg_LIBS) $(thread_LIBS) \
$(base_LIBS)
tcp_client_SOURCES = tcp_client.cxx
@@ -61,7 +61,7 @@ tcp_client_LDADD = \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lz \
$(network_LIBS) \
$(osg_LIBS) \
$(osg_LIBS) $(thread_LIBS) \
$(base_LIBS)
socktest_SOURCES = socktest.cxx
@@ -75,7 +75,7 @@ socktest_LDADD = \
$(top_builddir)/simgear/misc/libsgmisc.a \
-lz \
$(network_LIBS) \
$(osg_LIBS) \
$(osg_LIBS) $(thread_LIBS) \
$(base_LIBS)
lowtest_SOURCES = lowtest.cxx
@@ -87,7 +87,7 @@ lowtest_LDADD = \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
$(base_LIBS) -lz $(osg_LIBS)
$(thread_LIBS) $(base_LIBS) -lz $(osg_LIBS)
decode_binobj_SOURCES = decode_binobj.cxx
@@ -97,4 +97,4 @@ decode_binobj_LDADD = \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
$(base_LIBS) -lz $(osg_LIBS)
$(thread_LIBS) $(base_LIBS) -lz $(osg_LIBS)