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

[flightgear.git] / utils / fgviewer / Makefile.am

diff --git a/utils/fgviewer/Makefile.am b/utils/fgviewer/Makefile.am
index 1321349cf99c49e41d81170a7ac8ee82d1362c63..1932bb8fda280085c104f36bc230776da4e98068 100644 (file)
--- a/utils/fgviewer/Makefile.am
+++ b/utils/fgviewer/Makefile.am
@@ -3,8 +3,21 @@ AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
 
 bin_PROGRAMS = fgviewer
 
+if HAVE_FRAMEWORK_PLIB
+fgviewer_LDFLAGS = $(plib_FRAMEWORK)
+else
+fgviewer_PLIB_LIBS = -lplibul
+fgviewer_LDFLAGS =
+endif
+
+if HAVE_FRAMEWORK_OSG
+fgviewer_LDFLAGS += $(osg_FRAMEWORKS) $(openthreads_FRAMEWORK)
+else
+fgviewer_LDFLAGS += $(osg_LIBS) $(openthreads_LIBS)
+endif
+
 fgviewer_SOURCES = fgviewer.cxx
 fgviewer_LDADD = \
        -lsgtgdb -lsgmaterial -lsgmodel -lsgbvh -lsgutil -lsgio -lsgbucket \
        -lsgmath -lsgprops -lsgdebug -lsgmisc -lsgxml -lsgstructure \
-       -lplibul $(OSG_LIBS) $(opengl_LIBS) $(THREAD_LIBS) -lz
+       $(fgviewer_PLIB_LIBS) $(OSG_LIBS) $(opengl_LIBS) $(thread_LIBS) -lz