Automake changes to Hudson 'make check' runs.

Includes moving the OpenAL test programs to 'noinst' so they don't run as part of make check

diff --git a/configure.ac b/configure.ac
index f415fcaa76f9840135c17c1043c927c7bebf6523..41a7ada0377be9ec6421b5ff7a53bd30f52d7c25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,7 @@ case "${host}" in
 #       AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)

-#       AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
+        AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)

 #       osg_FRAMEWORKS="$FRAMEWORKS"
 #       FRAMEWORKS=""
 #       AC_SUBST(osg_FRAMEWORKS)
 #       osg_FRAMEWORKS="$FRAMEWORKS"
 #       FRAMEWORKS=""
 #       AC_SUBST(osg_FRAMEWORKS)

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index de98c035aaa3db6359633d213f2427eb13703ced..1f67b560ed78e115300cfd2fa0d307993165fa17 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -24,8 +24,8 @@ SUBDIRS = \
        scene \
        screen \
        serial \
        scene \
        screen \
        serial \

-       sound \

        threads \
        threads \

-       timing
+       timing \
+       sound 

 
 DIST_SUBDIRS = $(SUBDIRS) compatibility
 
 DIST_SUBDIRS = $(SUBDIRS) compatibility

diff --git a/simgear/scene/bvh/Makefile.am b/simgear/scene/bvh/Makefile.am
index c880a313ba87b42683891d2c3ab7184168ced22e..2e5389cb501759fb9969f18dce60cc0aedf0264c 100644 (file)
--- a/simgear/scene/bvh/Makefile.am
+++ b/simgear/scene/bvh/Makefile.am
@@ -4,7 +4,11 @@ check_PROGRAMS  = bvhtest
 TESTS           = $(check_PROGRAMS)
 
 bvhtest_SOURCES = bvhtest.cxx
 TESTS           = $(check_PROGRAMS)
 
 bvhtest_SOURCES = bvhtest.cxx

-bvhtest_LDADD = libsgbvh.a -lsgstructure -lsgmath $(base_LIBS)
+bvhtest_LDADD = libsgbvh.a \
+       $(top_builddir)/simgear/structure/libsgstructure.a \
+       $(top_builddir)/simgear/debug/libsgdebug.a \
+       $(base_LIBS)
+

 
 lib_LIBRARIES = libsgbvh.a
 
 
 lib_LIBRARIES = libsgbvh.a
 

diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index d14c9fb78953b147c8f378f09af4a1c752225ad8..e76fed450f893f9967c15538fd8f0135a21cd3cf 100644 (file)
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -18,7 +18,7 @@ libsgsound_a_SOURCES = \
        soundmgr_openal.cxx \
        xmlsound.cxx 
 
        soundmgr_openal.cxx \
        xmlsound.cxx 
 

-check_PROGRAMS = openal_test1 openal_test2 openal_test3
+noinst_PROGRAMS = openal_test1 openal_test2 openal_test3

 
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx
 
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx

diff --git a/simgear/sound/openal_test1.cxx b/simgear/sound/openal_test1.cxx
index e563753a9e5e9c785e6d8bd1b99de23df34e52d1..3d055b00104d72cf7111e3e56ba68f44a234c1c8 100644 (file)
--- a/simgear/sound/openal_test1.cxx
+++ b/simgear/sound/openal_test1.cxx
@@ -12,7 +12,7 @@
 # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
 # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>

-# include <OpenAL/alut.h>
+# include <ALUT/alut.h>

 #elif defined(OPENALSDK)
 # include <al.h>
 # include <alc.h>
 #elif defined(OPENALSDK)
 # include <al.h>
 # include <alc.h>