]> git.tue.mpg.de Git - paraslash.git/commitdiff
build: ldflags conversion: liboss.
authorAndre Noll <maan@systemlinux.org>
Fri, 13 Sep 2013 06:00:22 +0000 (06:00 +0000)
committerAndre Noll <maan@systemlinux.org>
Sun, 1 Dec 2013 10:51:58 +0000 (11:51 +0100)
Straight-forward change, no cppflags necessary.

Makefile.in
configure.ac

index 5eb89ec29dd06e4a07403898e5fd11118de08c5e..f329b65a879d7c9bd046f2ca9d6f18db8b36469e 100644 (file)
@@ -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 \
index 1a22fd07f21b3cb11f5b6fa387985ac6f16d2bff..4d0501b5534df5d9dc4b8bc195c4f0e20199d28d 100644 (file)
@@ -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)
                ]
        )
        ],