Merge branch 'next' of D:\Git_New\flightgear into next

[flightgear.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 57a0bd77cfab9c1e9f589d489ebac5614a8c4118..cade53233d653fcea3633b8961f8815608ad08ce 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,20 @@
 bin_PROGRAMS = est-epsilon gl-info alcinfo
 
-noinst_PROGRAMS = test-gethostname test-mktime test-text test-up test-env-map
+noinst_PROGRAMS = test-gethostname test-mktime test-text test-env-map
 
-est_epsilon_SOURCES = est-epsilon.c
+if HAVE_FRAMEWORK_PLIB
+test_up_LDFLAGS = $(plib_FRAMEWORK)
+else
+test_up_PLIB_LIBS = -lplibsg -lplibul
+endif
+
+est_epsilon_SOURCES = est-epsilon.cxx
 est_epsilon_LDADD =  $(opengl_LIBS)
 
-gl_info_SOURCES = gl-info.c
+gl_info_SOURCES = gl-info.cxx
 gl_info_LDADD = $(opengl_LIBS)
 
-alcinfo_SOURCES = alcinfo.c
+alcinfo_SOURCES = alcinfo.cxx
 alcinfo_LDADD = $(openal_LIBS)
 
 test_env_map_SOURCES = test-env-map.cxx
@@ -20,5 +26,3 @@ test_mktime_SOURCES = test-mktime.cxx
 
 test_text_SOURCES = test-text.cxx
 
-test_up_SOURCES = test-up.cxx
-test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS)