FGFS-4.1/simgear
4
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-07 19:21:53 +02:00
commit 9f684978cf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/Makefile.am
View File

@ -31,6 +31,7 @@ SUBDIRS_ALWAYS = \
bucket \ bucket \
ephemeris \ ephemeris \
$(HLA_DIR) \ $(HLA_DIR) \
$(SGTHREAD_DIR) \
io \ io \
magvar \ magvar \
math \ math \
@ -43,8 +44,7 @@ SUBDIRS_ALWAYS = \
SUBDIRS = $(SUBDIRS_ALWAYS) \ SUBDIRS = $(SUBDIRS_ALWAYS) \
$(compatibility_DIR) \ $(compatibility_DIR) \
$(METAR_DIRS) \ $(METAR_DIRS) \
$(SG_EXTRA_DIRS) \ $(SG_EXTRA_DIRS)
$(SGTHREAD_DIR)
DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads

5
simgear/io/Makefile.am
View File

@ -41,6 +41,7 @@ tcp_server_SOURCES = tcp_server.cxx
tcp_server_LDADD = \ tcp_server_LDADD = \
libsgio.a \ libsgio.a \
$(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/structure/libsgstructure.a \
$(top_builddir)/simgear/threads/libsgthreads.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
@ -54,6 +55,7 @@ tcp_client_SOURCES = tcp_client.cxx
tcp_client_LDADD = \ tcp_client_LDADD = \
libsgio.a \ libsgio.a \
$(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/structure/libsgstructure.a \
$(top_builddir)/simgear/threads/libsgthreads.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
@ -67,6 +69,7 @@ socktest_SOURCES = socktest.cxx
socktest_LDADD = \ socktest_LDADD = \
libsgio.a \ libsgio.a \
$(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/structure/libsgstructure.a \
$(top_builddir)/simgear/threads/libsgthreads.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
@ -80,6 +83,7 @@ lowtest_SOURCES = lowtest.cxx
lowtest_LDADD = \ lowtest_LDADD = \
libsgio.a \ libsgio.a \
$(top_builddir)/simgear/structure/libsgstructure.a \ $(top_builddir)/simgear/structure/libsgstructure.a \
$(top_builddir)/simgear/threads/libsgthreads.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
@ -89,6 +93,7 @@ decode_binobj_SOURCES = decode_binobj.cxx
decode_binobj_LDADD = \ decode_binobj_LDADD = \
libsgio.a \ libsgio.a \
$(top_builddir)/simgear/threads/libsgthreads.a \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \