Autopilot: clean up the helpers code (which drives the various /internal/) properties...

[flightgear.git] / src / GUI / Makefile.am

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index c6304fe7ba7d3ed4a7f827c8a4f1781eb403009f..890807f2a9734b5cc12f2d4d673784cbc273d6b6 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,24 +1,36 @@
 noinst_LIBRARIES = libGUI.a
 noinst_PROGRAMS = layout-test
 
+if HAVE_FRAMEWORK_PLIB
+layout_test_PLIB_FW = $(plib_FRAMEWORK)
+else
+layout_test_PLIB_LIBS = -lplibpw -lplibpu -lplibfnt -lplibul
+endif
+
+if HAVE_FRAMEWORK_OSG
+layout_test_OSG_LIBS = $(openthreads_FRAMEWORK)
+else
+layout_test_OSG_LIBS = $(openthreads_LIBS)
+endif
+
 libGUI_a_SOURCES = \
         new_gui.cxx new_gui.hxx \
         dialog.cxx dialog.hxx \
        menubar.cxx menubar.hxx \
        gui.cxx gui.h gui_funcs.cxx \
-       gui_local.cxx gui_local.hxx \
-       mouse.cxx fonts.cxx \
-       sgVec3Slider.cxx sgVec3Slider.hxx \
-       trackball.c trackball.h \
-       puList.cxx puList.hxx \
+       fonts.cxx \
        AirportList.cxx AirportList.hxx \
         property_list.cxx property_list.hxx \
-        layout.cxx layout-props.cxx layout.hxx
+        layout.cxx layout-props.cxx layout.hxx \
+       SafeTexFont.cxx SafeTexFont.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 layout_test_SOURCES = layout-test.cxx
 
 layout_test_LDADD = libGUI.a \
-                    -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \
-                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
+                    -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml -lsgtiming \
+                    $(layout_test_PLIB_LIBS) $(opengl_LIBS)
+
+# mainly for Macs
+layout_test_LDFLAGS = $(layout_test_PLIB_FW) $(layout_test_OSG_LIBS)