Blob Blame Raw
commit 2155d5079a17409c3f7f9699877df3c6602fd6a0
Author: Fabrice Bellet <fabrice@bellet.info>
Date:   Thu Jul 7 22:31:59 2011 +0200

    Don't build programs that won't be installed

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index df5d29f..c37c45c 100644
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -7,12 +7,4 @@ include_HEADERS = newbucket.hxx
 libsgbucket_la_SOURCES = newbucket.cxx
 libsgbucket_la_LDFLAGS = -release @VERSION@ -module
 
-# noinst_PROGRAMS = testbucket
-
-# testbucket_SOURCES = testbucket.cxx
-
-# testbucket_LDADD = \
-# 	libsgbucket.a \
-# 	$(top_builddir)/misc/libsgmisc.a
-
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index db72183..d2fd584 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -31,70 +31,3 @@ libsgio_la_SOURCES = \
 libsgio_la_LDFLAGS = -release @VERSION@ -module
 
 INCLUDES = -I$(top_srcdir)
-
-noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
-
-tcp_server_SOURCES = tcp_server.cxx
-
-tcp_server_LDFLAGS = -Wl,--allow-shlib-undefined
-
-tcp_server_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/bucket/libsgbucket.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	-lz \
-	$(network_LIBS) \
-	$(base_LIBS)
-
-tcp_client_SOURCES = tcp_client.cxx
-
-tcp_client_LDFLAGS = -Wl,--allow-shlib-undefined
-
-tcp_client_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/bucket/libsgbucket.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	-lz \
-	$(network_LIBS) \
-	$(base_LIBS)
-
-socktest_SOURCES = socktest.cxx
-
-socktest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-socktest_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/bucket/libsgbucket.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-    -lz \
-	$(network_LIBS) \
-	$(base_LIBS) 
-
-lowtest_SOURCES = lowtest.cxx
-
-lowtest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-lowtest_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/bucket/libsgbucket.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(base_LIBS) -lz
-
-decode_binobj_SOURCES = decode_binobj.cxx
-
-decode_binobj_LDFLAGS = -Wl,--allow-shlib-undefined
-
-decode_binobj_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/bucket/libsgbucket.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(base_LIBS) -lz
diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am
index 7d3121e..7fdae01 100644
--- a/simgear/magvar/Makefile.am
+++ b/simgear/magvar/Makefile.am
@@ -8,14 +8,4 @@ libsgmagvar_la_SOURCES = coremag.cxx magvar.cxx
 
 libsgmagvar_la_LDFLAGS = -release @VERSION@ -module
 
-noinst_PROGRAMS = testmagvar
-
-testmagvar_SOURCES = testmagvar.cxx
-
-testmagvar_LDFLAGS = -Wl,--allow-shlib-undefined
-
-testmagvar_LDADD = \
-	$(top_builddir)/simgear/magvar/libsgmagvar.la \
-	$(base_LIBS)
-
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index c534813..493c114 100644
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -1,28 +1,5 @@
 includedir = @includedir@/math
 
-check_PROGRAMS  = SGMathTest SGGeometryTest
-TESTS           = $(check_PROGRAMS)
-
-SGMathTest_SOURCES = SGMathTest.cxx
-
-SGMathTest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-SGMathTest_LDADD = \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(base_LIBS)
-
-SGGeometryTest_SOURCES = SGGeometryTest.cxx
-
-SGGeometryTest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-SGGeometryTest_LDADD = \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(base_LIBS)
-
 lib_LTLIBRARIES = libsgmath.la
 
 include_HEADERS = \
diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 9e24efe..a65bea4 100644
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -32,14 +32,4 @@ libsgmisc_la_SOURCES = \
 
 libsgmisc_la_LDFLAGS = -release @VERSION@ -module
 
-#noinst_PROGRAMS = tabbed_value_test swap_test
-
-#tabbed_value_test_SOURCES = tabbed_values_test.cxx
-#tabbed_value_test_LDADD = \
-#	libsgmisc.a \
-#	$(top_builddir)/simgear/xml/libsgxml.a \
-#	$(top_builddir)/simgear/debug/libsgdebug.a
-
-#swap_test_SOURCES = swap_test.cpp
-
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index dc0b50c..43ab633 100644
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -20,31 +20,4 @@ libsgprops_la_SOURCES = \
 
 libsgprops_la_LDFLAGS = -release @VERSION@ -module
 
-check_PROGRAMS = props_test propertyObject_test
-TESTS           = propertyObject_test
-
-props_test_SOURCES = props_test.cxx
-props_test_LDFLAGS = -Wl,--allow-shlib-undefined
-props_test_LDADD = \
-	$(top_builddir)/simgear/props/libsgprops.la \
-	$(top_builddir)/simgear/xml/libsgxml.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la
-
-propertyObject_test_SOURCES = propertyObject_test.cxx
-propertyObject_test_LDFLAGS = -Wl,--allow-shlib-undefined
-propertyObject_test_LDADD = \
-	$(top_builddir)/simgear/props/libsgprops.la \
-	$(top_builddir)/simgear/xml/libsgxml.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la
-
-if HAVE_FRAMEWORK_OSG
-props_test_LDADD += $(openthreads_FRAMEWORK)
-else
-props_test_LDADD += -lOpenThreads
-endif
-
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am
index 2aaa176..6e5614b 100644
--- a/simgear/route/Makefile.am
+++ b/simgear/route/Makefile.am
@@ -11,31 +11,3 @@ libsgroute_la_SOURCES = \
 libsgroute_la_LDFLAGS = -release @VERSION@ -module
 
 INCLUDES = -I$(top_srcdir)
-
-noinst_PROGRAMS = waytest routetest
-
-waytest_SOURCES = waytest.cxx
-
-waytest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-waytest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.la \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/xml/libsgxml.la \
-	$(base_LIBS) \
-	-lz
-
-routetest_SOURCES = routetest.cxx
-
-routetest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-routetest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.la \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(base_LIBS)
diff --git a/simgear/scene/bvh/Makefile.am b/simgear/scene/bvh/Makefile.am
index 6464632..398f706 100644
--- a/simgear/scene/bvh/Makefile.am
+++ b/simgear/scene/bvh/Makefile.am
@@ -1,19 +1,5 @@
 includedir = @includedir@/scene/bvh
 
-check_PROGRAMS  = bvhtest
-TESTS           = $(check_PROGRAMS)
-
-bvhtest_SOURCES = bvhtest.cxx
-
-bvhtest_LDFLAGS = -Wl,--allow-shlib-undefined
-
-bvhtest_LDADD = \
-	$(top_builddir)/simgear/scene/bvh/libsgbvh.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(base_LIBS)
-
-
 lib_LTLIBRARIES = libsgbvh.la
 
 noinst_HEADERS =
diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 1899ce2..09d0ad4 100644
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -8,14 +8,4 @@ libsgserial_la_SOURCES = serial.cxx
 
 libsgserial_la_LDFLAGS = -release @VERSION@ -module
 
-noinst_PROGRAMS = testserial
-
-testserial_SOURCES = testserial.cxx
-
-testserial_LDFLAGS = -Wl,--allow-shlib-undefined
-
-testserial_LDADD = \
-	$(top_builddir)/simgear/serial/libsgserial.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la
-
 INCLUDES = -I$(top_srcdir)
diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index a492534..af1e1ce 100644
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -22,47 +22,4 @@ libsgsound_la_SOURCES = \
 
 libsgsound_la_LDFLAGS = -release @VERSION@ -module
 
-check_PROGRAMS = openal_test1 openal_test2 openal_test3 openal_test4
-
-openal_test1_SOURCES = openal_test1.cxx
-openal_test2_SOURCES = openal_test2.cxx
-openal_test3_SOURCES = openal_test3.cxx
-openal_test4_SOURCES = openal_test4.cxx
-
-openal_test1_LDFLAGS = -Wl,--allow-shlib-undefined
-openal_test2_LDFLAGS = -Wl,--allow-shlib-undefined
-openal_test3_LDFLAGS = -Wl,--allow-shlib-undefined
-openal_test4_LDFLAGS = -Wl,--allow-shlib-undefined
-
-openal_test1_LDADD = \
-	$(top_builddir)/simgear/sound/libsgdebug.la \
-	$(openal_LIBS)
-
-openal_test2_LDADD = \
-	$(top_builddir)/simgear/sound/libsgsound.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/timing/libsgtiming.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(openal_LIBS)
-
-openal_test3_LDADD = \
-	$(top_builddir)/simgear/sound/libsgsound.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/timing/libsgtiming.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(openal_LIBS) -lstdc++
-
-openal_test4_LDADD = \
-	$(top_builddir)/simgear/sound/libsgsound.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/timing/libsgtiming.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/math/libsgmath.la \
-	$(openal_LIBS) -lstdc++
-
 INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"