X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2FMakefile.am;h=890807f2a9734b5cc12f2d4d673784cbc273d6b6;hb=5cad5aa7da2476ca8323a61f81dea59676dca085;hp=7140523c8bdeadcc14390b13a0ec536cef37f5d4;hpb=f0e40fa3f8b33e97ec9a0692c268b653b7d9f8b8;p=flightgear.git

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 7140523c8..890807f2a 100644
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,23 +1,36 @@
 noinst_LIBRARIES = libGUI.a
+noinst_PROGRAMS = layout-test
 
-if ENABLE_NETWORK_OLK
-NETWORK_SRCS = net_dlg.cxx net_dlg.hxx 
+if HAVE_FRAMEWORK_PLIB
+layout_test_PLIB_FW = $(plib_FRAMEWORK)
 else
-NETWORK_SRCS = 
+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 = \
-	apt_dlg.cxx apt_dlg.hxx \
+        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 \
-	$(NETWORK_SRCS) \
-	prop_picker.cxx prop_picker.hxx \
-	sgVec3Slider.cxx sgVec3Slider.hxx \
-	trackball.c trackball.h
+	fonts.cxx \
+	AirportList.cxx AirportList.hxx \
+        property_list.cxx property_list.hxx \
+        layout.cxx layout-props.cxx layout.hxx \
+	SafeTexFont.cxx SafeTexFont.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif
+
+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)