From 6aa459073e412d5ada063858a0f9e8e8c5b5824f Mon Sep 17 00:00:00 2001 From: torsten Date: Thu, 20 Aug 2009 13:10:56 +0000 Subject: [PATCH] don't build tabbed_value_test, swap_test, openal_test1 and openal_test2 by default. --- simgear/misc/Makefile.am | 14 +++++++------- simgear/sound/Makefile.am | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index db9181ba..dd4e6e41 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -24,13 +24,13 @@ libsgmisc_a_SOURCES = \ interpolator.cxx \ PathOptions.cxx -noinst_PROGRAMS = tabbed_value_test swap_test +#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 +#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 $(top_builddir)/simgear/xml/libsgxml.a: cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a @@ -38,6 +38,6 @@ $(top_builddir)/simgear/xml/libsgxml.a: $(top_builddir)/simgear/debug/libsgdebug.a: cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a -swap_test_SOURCES = swap_test.cpp +#swap_test_SOURCES = swap_test.cpp INCLUDES = -I$(top_srcdir) diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am index 48381175..e421cdef 100644 --- a/simgear/sound/Makefile.am +++ b/simgear/sound/Makefile.am @@ -16,21 +16,21 @@ libsgsound_a_SOURCES = \ soundmgr_openal.cxx \ xmlsound.cxx -noinst_PROGRAMS = openal_test1 openal_test2 - -openal_test1_SOURCES = openal_test1.cxx -openal_test2_SOURCES = openal_test2.cxx - -openal_test1_LDADD = \ - $(top_builddir)/simgear/debug/libsgdebug.a \ - $(openal_LIBS) - -openal_test2_LDADD = \ - libsgsound.a \ - $(top_builddir)/simgear/debug/libsgdebug.a \ - $(top_builddir)/simgear/misc/libsgmisc.a \ - $(top_builddir)/simgear/structure/libsgstructure.a \ - $(openal_LIBS) \ - -lOpenThreads +#noinst_PROGRAMS = openal_test1 openal_test2 + +#openal_test1_SOURCES = openal_test1.cxx +#openal_test2_SOURCES = openal_test2.cxx + +#openal_test1_LDADD = \ +# $(top_builddir)/simgear/debug/libsgdebug.a \ +# $(openal_LIBS) + +#openal_test2_LDADD = \ +# libsgsound.a \ +# $(top_builddir)/simgear/debug/libsgdebug.a \ +# $(top_builddir)/simgear/misc/libsgmisc.a \ +# $(top_builddir)/simgear/structure/libsgstructure.a \ +# $(openal_LIBS) \ +# -lOpenThreads INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\" -- 2.39.5