Blob Blame Raw
commit 82ef804c77176e7eb5454146a600d53c708d40b6
Author: Fabrice Bellet <fabrice@bellet.info>
Date:   Thu Jul 7 22:32:16 2011 +0200

    Add a minimal set of dependencies to allow building FlightGear, Atlas
    and fgrun without having to modify their respective makefiles due to the
    move from static to shared libs.

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index fc9c7b0..715f95b 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -13,7 +13,7 @@ if WANT_HEADLESS
 SG_EXTRA_DIRS =
 METAR_DIRS = 
 else
-SG_EXTRA_DIRS = scene sound screen
+SG_EXTRA_DIRS = screen scene sound
 METAR_DIRS = environment
 endif
 
@@ -26,24 +26,24 @@ endif
 SUBDIRS_ALWAYS = \
 	xml \
 	debug \
-	misc \
+	props \
+	timing \
+	math \
 	structure \
+	misc \
 	bucket \
 	ephemeris \
 	$(HLA_DIR) \
+	serial \
 	io \
 	magvar \
-	math \
 	nasal \
-	props \
-	route \
-	serial \
-	timing
+	route
 
 SUBDIRS = $(SUBDIRS_ALWAYS) \
 	$(compatibility_DIR) \
-	$(METAR_DIRS) \
 	$(SG_EXTRA_DIRS) \
+	$(METAR_DIRS) \
 	$(SGTHREAD_DIR)
 
 DIST_SUBDIRS = $(SUBDIRS_ALWAYS) compatibility scene sound screen environment threads
diff --git a/simgear/environment/Makefile.am b/simgear/environment/Makefile.am
index 7e5a1c1..8b65d23 100644
--- a/simgear/environment/Makefile.am
+++ b/simgear/environment/Makefile.am
@@ -6,5 +6,8 @@ include_HEADERS = metar.hxx precipitation.hxx visual_enviro.hxx
 
 libsgenvironment_la_SOURCES = metar.cxx precipitation.cxx
 libsgenvironment_la_LDFLAGS = -release @VERSION@ -module
+libsgenvironment_la_LIBADD = \
+	$(top_builddir)/simgear/scene/sky/libsgsky.la \
+	$(top_builddir)/simgear/sound/libsgsound.la
 
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d2fd584..fd05655 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -30,4 +30,8 @@ libsgio_la_SOURCES = \
 
 libsgio_la_LDFLAGS = -release @VERSION@ -module
 
+libsgio_la_LIBADD = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index 493c114..0875c0a 100644
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -44,4 +44,8 @@ libsgmath_la_SOURCES = \
 
 libsgmath_la_LDFLAGS = -release @VERSION@ -module
 
+libsgmath_la_LIBADD = \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index a65bea4..e136a4f 100644
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -30,6 +30,9 @@ libsgmisc_la_SOURCES = \
 	ResourceManager.cxx \
 	sg_sleep.cxx
 
-libsgmisc_la_LDFLAGS = -release @VERSION@ -module
+libsgmisc_la_LDFLAGS = -release @VERSION@ -module -losg -losgDB -lz
+
+libsgmisc_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la
 
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index 43ab633..8e13301 100644
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -20,4 +20,7 @@ libsgprops_la_SOURCES = \
 
 libsgprops_la_LDFLAGS = -release @VERSION@ -module
 
+libsgprops_la_LIBADD = \
+	$(top_builddir)/simgear/xml/libsgxml.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/scene/Makefile.am b/simgear/scene/Makefile.am
index 9d26da4..3cecafe 100644
--- a/simgear/scene/Makefile.am
+++ b/simgear/scene/Makefile.am
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene
 
-SUBDIRS = bvh material model sky tgdb util tsync
+SUBDIRS = bvh tgdb material model util sky tsync
 
 # lib_LIBRARIES = libsgscene.a
 
diff --git a/simgear/scene/material/Makefile.am b/simgear/scene/material/Makefile.am
index 1032f9f..808ca77 100644
--- a/simgear/scene/material/Makefile.am
+++ b/simgear/scene/material/Makefile.am
@@ -36,4 +36,7 @@ libsgmaterial_la_SOURCES = \
 
 libsgmaterial_la_LDFLAGS = -release @VERSION@ -module
 
+libsgmaterial_la_LIBADD = \
+	$(top_builddir)/simgear/scene/tgdb/libsgtgdb.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/scene/model/Makefile.am b/simgear/scene/model/Makefile.am
index e9a3b3b..6246c31 100644
--- a/simgear/scene/model/Makefile.am
+++ b/simgear/scene/model/Makefile.am
@@ -51,4 +51,8 @@ libsgmodel_la_SOURCES = \
 
 libsgmodel_la_LDFLAGS = -release @VERSION@ -module
 
+libsgmodel_la_LIBADD = \
+	$(top_builddir)/simgear/scene/material/libsgmaterial.la \
+	$(top_builddir)/simgear/scene/bvh/libsgbvh.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/scene/sky/Makefile.am b/simgear/scene/sky/Makefile.am
index dd16a7d..c2314a9 100644
--- a/simgear/scene/sky/Makefile.am
+++ b/simgear/scene/sky/Makefile.am
@@ -28,4 +28,9 @@ libsgsky_la_SOURCES = \
 
 libsgsky_la_LDFLAGS = -release @VERSION@ -module
 
+libsgsky_la_LIBADD = \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/scene/util/libsgutil.la \
+	$(top_builddir)/simgear/scene/model/libsgmodel.la
+
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 7a46676..01a3fe8 100644
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -26,6 +26,12 @@ libsgscreen_la_SOURCES = \
 	extensions.cxx
 	
 libsgscreen_la_LDFLAGS = -release @VERSION@ -module
+if ENABLE_JPEG_SERVER
+libsgscreen_la_LDFLAGS += -ljpeg
+endif
+
+libsgscreen_la_LIBADD = \
+	$(top_builddir)/simgear/misc/libsgmisc.la
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) 
 
diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index af1e1ce..50556bd 100644
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -20,6 +20,6 @@ libsgsound_la_SOURCES = \
 	sample_queue.cxx \
 	xmlsound.cxx
 
-libsgsound_la_LDFLAGS = -release @VERSION@ -module
+libsgsound_la_LDFLAGS = -release @VERSION@ -module -lopenal -lalut
 
 INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
diff --git a/simgear/structure/Makefile.am b/simgear/structure/Makefile.am
index c94ab43..99844b8 100644
--- a/simgear/structure/Makefile.am
+++ b/simgear/structure/Makefile.am
@@ -38,5 +38,10 @@ libsgstructure_la_SOURCES = \
 
 libsgstructure_la_LDFLAGS = -release @VERSION@ -module
 
+libsgstructure_la_LIBADD = \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/timing/libsgtiming.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)