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
This commit is contained in:
parent
87169febf8
commit
ae22321d9c
@ -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(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)
|
||||
|
@ -24,8 +24,8 @@ SUBDIRS = \
|
||||
scene \
|
||||
screen \
|
||||
serial \
|
||||
sound \
|
||||
threads \
|
||||
timing
|
||||
timing \
|
||||
sound
|
||||
|
||||
DIST_SUBDIRS = $(SUBDIRS) compatibility
|
||||
|
@ -4,7 +4,11 @@ check_PROGRAMS = bvhtest
|
||||
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
|
||||
|
||||
|
@ -18,7 +18,7 @@ libsgsound_a_SOURCES = \
|
||||
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
|
||||
|
@ -12,7 +12,7 @@
|
||||
# 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>
|
||||
|
Loading…
Reference in New Issue
Block a user