Merge branch 'jmt/gps' into next

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

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index b2b473bd5c3ac8a7af384edb5ef6d4413573727e..03792dcfcecb6927272d6178be7028fbbe4d99b4 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,12 +1,38 @@
-if ENABLE_XMESA_FX                                                              
-DEFS += -DXMESA -DFX
-endif                                                                           
-                                                                                
 noinst_LIBRARIES = libGUI.a
+noinst_PROGRAMS = layout-test
 
-libGUI_a_SOURCES = gui.cxx gui.h
+if HAVE_FRAMEWORK_PLIB
+layout_test_PLIB_FW = $(plib_FRAMEWORK)
+else
+layout_test_PLIB_LIBS = -lplibpw -lplibpu -lplibfnt -lplibul
+endif
 
-INCLUDES += -I$(top_builddir) \
-       -I$(top_builddir)/Lib \
-       -I$(top_builddir)/Lib/plib/include \
-       -I$(top_builddir)/Simulator
+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 \
+        fonts.cxx \
+        AirportList.cxx AirportList.hxx \
+        property_list.cxx property_list.hxx \
+        layout.cxx layout-props.cxx layout.hxx \
+        SafeTexFont.cxx SafeTexFont.hxx \
+        WaypointList.cxx WaypointList.hxx \
+        MapWidget.cxx MapWidget.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 -lsgtiming \
+                    $(layout_test_PLIB_LIBS) $(opengl_LIBS)
+
+# mainly for Macs
+layout_test_LDFLAGS = $(layout_test_PLIB_FW) $(layout_test_OSG_LIBS)