build-sys: Cleanup Makefile.am

No need to keep some tests in two lists.
This commit is contained in:
Maarten Bosmans 2011-06-23 22:21:01 +02:00 committed by Colin Guthrie
parent 8ce326816b
commit 2cfacc6f55

View file

@ -85,6 +85,7 @@ AM_LDFLAGS+=-Wl,-headerpad_max_install_names -headerpad_max_install_names
endif endif
FOREIGN_CFLAGS = -w FOREIGN_CFLAGS = -w
MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED) MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED)
MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
@ -240,8 +241,6 @@ pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# Test programs # # Test programs #
################################### ###################################
# missing: mcalign-test flist-test pacat-simple parec-simple sync-playback rtstutter stripnul interpol-test thread-test connect-stress
TESTS = \ TESTS = \
mainloop-test \ mainloop-test \
strlist-test \ strlist-test \
@ -270,59 +269,27 @@ TESTS = \
lock-autospawn-test \ lock-autospawn-test \
prioq-test prioq-test
TESTS_BINARIES = \ TESTS_norun = \
mainloop-test \
mcalign-test \ mcalign-test \
pacat-simple \ pacat-simple \
parec-simple \ parec-simple \
extended-test \ extended-test \
strlist-test \
close-test \
voltest \
vector-test \
memblockq-test \
sync-playback \ sync-playback \
interpol-test \ interpol-test \
channelmap-test \
thread-mainloop-test \
utf8-test \
format-test \
get-binary-name-test \
ipacl-test \
hook-list-test \
memblock-test \
thread-test \ thread-test \
flist-test \ flist-test \
asyncq-test \
asyncmsgq-test \
queue-test \
rtpoll-test \
sig2str-test \
resampler-test \
smoother-test \
mix-test \
remix-test \
proplist-test \
rtstutter \ rtstutter \
stripnul \ stripnul \
lock-autospawn-test \
prioq-test \
connect-stress connect-stress
if !OS_IS_WIN32 if !OS_IS_WIN32
TESTS += \ TESTS += \
sigbus-test \ sigbus-test \
usergroup-test usergroup-test
TESTS_BINARIES += \
sigbus-test \
usergroup-test
endif endif
if HAVE_SIGXCPU if HAVE_SIGXCPU
#TESTS += \ TESTS_norun += \
# cpulimit-test \
# cpulimit-test2
TESTS_BINARIES += \
cpulimit-test \ cpulimit-test \
cpulimit-test2 cpulimit-test2
endif endif
@ -330,17 +297,15 @@ endif
if HAVE_GLIB20 if HAVE_GLIB20
TESTS += \ TESTS += \
mainloop-test-glib mainloop-test-glib
TESTS_BINARIES += \
mainloop-test-glib
endif endif
if HAVE_GTK20 if HAVE_GTK20
TESTS_BINARIES += \ TESTS_norun += \
gtk-test gtk-test
endif endif
if HAVE_ALSA if HAVE_ALSA
TESTS_BINARIES += \ TESTS_norun += \
alsa-time-test alsa-time-test
endif endif
@ -352,9 +317,9 @@ endif
endif endif
if BUILD_TESTS_DEFAULT if BUILD_TESTS_DEFAULT
noinst_PROGRAMS = $(TESTS_BINARIES) noinst_PROGRAMS = $(TESTS) $(TESTS_norun)
else else
check_PROGRAMS = $(TESTS_BINARIES) check_PROGRAMS = $(TESTS) $(TESTS_norun)
endif endif
mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_SOURCES = tests/mainloop-test.c
@ -664,7 +629,9 @@ libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(LIBJSON_LIBS) libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(LIBJSON_LIBS)
if HAVE_X11 if HAVE_X11
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulse/client-conf-x11.c pulse/client-conf-x11.h libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
pulse/client-conf-x11.c pulse/client-conf-x11.h \
pulsecore/x11prop.c pulsecore/x11prop.h
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS)
endif endif
@ -698,12 +665,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
endif !OS_IS_DARWIN endif !OS_IS_DARWIN
endif !OS_IS_WIN32 endif !OS_IS_WIN32
if HAVE_X11
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulsecore/x11prop.c pulsecore/x11prop.h
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS)
endif
if HAVE_LIBASYNCNS if HAVE_LIBASYNCNS
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS) libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS) libpulsecommon_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)