Hi,
Same fixes I submitted a while ago for FG and SG plib branch a while
ago, but this time for the OSG branch. This solves a few dependencies
problems which break things like make -j
Pigeon.
diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index e9c8e6b..e2767c6 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -65,7 +65,7 @@ libMain_a_SOURCES = \
fgfs_SOURCES = bootstrap.cxx
fgfs_LDADD = \
- $(top_builddir)/src/Main/libMain.a \
+ libMain.a \
$(top_builddir)/src/Aircraft/libAircraft.a \
$(top_builddir)/src/ATC/libATC.a \
$(top_builddir)/src/Cockpit/libCockpit.a \
diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d7149cf..f597465 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -27,7 +27,7 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
tcp_server_SOURCES = tcp_server.cxx
tcp_server_LDADD = \
- $(top_builddir)/simgear/io/libsgio.a \
+ libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -38,7 +38,7 @@ tcp_server_LDADD = \
tcp_client_SOURCES = tcp_client.cxx
tcp_client_LDADD = \
- $(top_builddir)/simgear/io/libsgio.a \
+ libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -49,7 +49,7 @@ tcp_client_LDADD = \
socktest_SOURCES = socktest.cxx
socktest_LDADD = \
- $(top_builddir)/simgear/io/libsgio.a \
+ libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -60,7 +60,7 @@ socktest_LDADD = \
lowtest_SOURCES = lowtest.cxx
lowtest_LDADD = \
- $(top_builddir)/simgear/io/libsgio.a \
+ libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -69,7 +69,7 @@ lowtest_LDADD = \
decode_binobj_SOURCES = decode_binobj.cxx
decode_binobj_LDADD = \
- $(top_builddir)/simgear/io/libsgio.a \
+ libsgio.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am
index 619e283..03aa978 100644
--- a/simgear/magvar/Makefile.am
+++ b/simgear/magvar/Makefile.am
@@ -13,7 +13,7 @@ noinst_PROGRAMS = testmagvar
testmagvar_SOURCES = testmagvar.cxx
testmagvar_LDADD = \
- $(top_builddir)/simgear/magvar/libsgmagvar.a \
+ libsgmagvar.a \
$(base_LIBS)
INCLUDES = -I$(top_srcdir)
diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 4e9b64e..44221dd 100644
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -26,7 +26,7 @@ noinst_PROGRAMS = tabbed_value_test swap_test
tabbed_value_test_SOURCES = tabbed_values_test.cxx
tabbed_value_test_LDADD = \
- $(top_builddir)/simgear/misc/libsgmisc.a \
+ libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \
$(top_builddir)/simgear/debug/libsgdebug.a
diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index 30265b6..f1cf6f9 100644
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -16,7 +16,7 @@ noinst_PROGRAMS = props_test
props_test_SOURCES = props_test.cxx
props_test_LDADD = \
- $(top_builddir)/simgear/props/libsgprops.a \
+ libsgprops.a \
$(top_builddir)/simgear/xml/libsgxml.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am
index 7eb2787..d3d1f10 100644
--- a/simgear/route/Makefile.am
+++ b/simgear/route/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = waytest routetest
waytest_SOURCES = waytest.cxx
waytest_LDADD = \
- $(top_builddir)/simgear/route/libsgroute.a \
+ libsgroute.a \
$(top_builddir)/simgear/math/libsgmath.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
@@ -28,7 +28,7 @@ waytest_LDADD = \
routetest_SOURCES = routetest.cxx
routetest_LDADD = \
- $(top_builddir)/simgear/route/libsgroute.a \
+ libsgroute.a \
$(top_builddir)/simgear/math/libsgmath.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(base_LIBS)
diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 482bba6..11e5a1d 100644
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -41,7 +41,7 @@ noinst_PROGRAMS = TestRenderTexture
TestRenderTexture_SOURCES = TestRenderTexture.cpp
TestRenderTexture_LDADD = \
- $(top_builddir)/simgear/screen/libsgscreen.a \
+ libsgscreen.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(opengl_LIBS)
endif
diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 17af84e..0cace19 100644
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -11,7 +11,7 @@ noinst_PROGRAMS = testserial
testserial_SOURCES = testserial.cxx
testserial_LDADD = \
- $(top_builddir)/simgear/serial/libsgserial.a \
+ libsgserial.a \
$(top_builddir)/simgear/debug/libsgdebug.a
INCLUDES = -I$(top_srcdir)
diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index 684303f..c627346 100644
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -26,7 +26,7 @@ openal_test1_LDADD = \
$(openal_LIBS)
openal_test2_LDADD = \
- $(top_builddir)/simgear/sound/libsgsound.a \
+ libsgsound.a \
$(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/structure/libsgstructure.a \
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
