From: Andre Noll Date: Fri, 13 Sep 2013 06:00:22 +0000 (+0000) Subject: build: ldflags conversion: liboss. X-Git-Tag: v0.5.1~1^2~39 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6c632dfdbeab2b583aca0be29b7c7b3620a97f07;p=paraslash.git build: ldflags conversion: liboss. Straight-forward change, no cppflags necessary. --- diff --git a/Makefile.in b/Makefile.in index 5eb89ec2..f329b65a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,6 +30,7 @@ opus_ldflags := @opus_ldflags@ faad_ldflags := @faad_ldflags@ mad_ldflags := @mad_ldflags@ flac_ldflags := @flac_ldflags@ +oss_ldflags := @oss_ldflags@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") @@ -265,6 +266,7 @@ endif para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags) para_audiod para_filter para_play: LDFLAGS += $(mad_ldflags) +para_write para_play para_audiod para_fade: LDFLAGS += $(oss_ldflags) para_server \ para_filter \ diff --git a/configure.ac b/configure.ac index 1a22fd07..4d0501b5 100644 --- a/configure.ac +++ b/configure.ac @@ -871,10 +871,8 @@ AC_CHECK_HEADER(sys/soundcard.h, [ default_mixer="OSS_MIX" AC_CHECK_LIB(ossaudio, _oss_ioctl, [ - audiod_ldflags="$audiod_ldflags -lossaudio" - play_ldflags="$play_ldflags -lossaudio" - write_ldflags="$write_ldflags -lossaudio" - fade_ldflags="$fade_ldflags -lossaudio" + oss_ldflags="-lossaudio" + AC_SUBST(oss_ldflags) ] ) ],