[asterisk-commits] branch group/autoconf_and_menuselect r19939 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Apr 13 18:39:36 2006
New Revision: 19939

URL: http://svn.digium.com/view/asterisk?rev=19939&view=rev
Log:
configurify the build of chan_alsa

Modified:
    team/group/autoconf_and_menuselect/channels/Makefile
    team/group/autoconf_and_menuselect/configure.ac

Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=19939&r1=19938&r2=19939&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Thu Apr 13 18:39:36 2006
@@ -66,13 +66,6 @@
 
 CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
 
-ALSA_SRC=chan_alsa.c
-
-ifneq ($(wildcard alsa-monitor.h),)
-  CFLAGS+=-DALSA_MONITOR
-  ALSA_SRC+=alsa-monitor.h
-endif
-
 CFLAGS+=-DCRYPTO
 
 ifneq ($(OSARCH),CYGWIN)
@@ -127,8 +120,6 @@
 
 chan_oss.o: chan_oss.c busy.h ringtone.h
 
-chan_alsa.o: chan_alsa.c busy.h ringtone.h
-
 ifeq (${OSARCH},OpenBSD)
 chan_oss.so: chan_oss.o
 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
@@ -153,10 +144,11 @@
 chan_agent.so: chan_agent.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_agent.o ${CYGSOLIB} ${CYG_CHAN_AGENT}
 
-chan_alsa.o: $(ALSA_SRC)
+chan_alsa.so: chan_alsa.o
+	$(CC) $(SOLINK) -o $@ $< $(ASOUND_LIBS)
 
-chan_alsa.so: chan_alsa.o
-	$(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
+chan_alsa.o: chan_alsa.c busy.h ringtone.h
+	$(CC) -c -o $@ $(CFLAGS) $(ASOUND_INCLUDE) $<
 
 chan_nbs.so: chan_nbs.o
 	$(CC) $(SOLINK) -o $@ $< -lnbs

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=19939&r1=19938&r2=19939&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Thu Apr 13 18:39:36 2006
@@ -146,7 +146,7 @@
 
 AST_EXT_LIB([ogg], [ogg_sync_init], [OGG], [OGG])
 AST_EXT_LIB([vorbis], [vorbis_info_init], [VORBIS], [Vorbis])
-AST_EXT_LIB([asound], [snd_spcm_init], [ALSA], [Advanced Linux Sound Architecture])
+AST_EXT_LIB([asound], [snd_spcm_init], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
 AST_EXT_LIB([nbs], [nbs_setup], [NBS], [Network Broadcast Sound])
 AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS], [Open Sound System])
 AST_EXT_LIB([speex], [speex_encode], [SPEEX], [Speex])