diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 17:49:50 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 17:49:50 +0000 |
commit | 0adfa8c6356d0a6a5716b697bd1ed8ff11e7594b (patch) | |
tree | c3f0224e1268668ce524daaf2f780a646329fa02 /channels | |
parent | 70a2a3eaba842bcfb841accaeee2d1c593e1ba39 (diff) |
use proper method of detecting OSS support on Linux and FreeBSD
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/Makefile | 9 | ||||
-rw-r--r-- | channels/chan_oss.c | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/channels/Makefile b/channels/Makefile index aca979f52..0b4ddacc3 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -103,15 +103,10 @@ ringtone.h: gentone ./gentone ringtone 440 480 chan_oss.o: chan_oss.c busy.h ringtone.h + $(CC) -c -o $@ $(CFLAGS) $(OSSAUDIO_INCLUDE) $< -ifeq ($(OSARCH),OpenBSD) chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio -endif -ifeq ($(OSARCH),NetBSD) -chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio -endif + $(CC) $(SOLINK) -o $@ chan_oss.o $(OSSAUDIO_LIB) chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o $(CC) $(SOLINK) -o $@ $< iax2-parser.o iax2-provision.o diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 09b4b43bb..8e9bbe4f3 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -33,7 +33,7 @@ */ /*** MODULEINFO - <depend>osssound</depend> + <depend>ossaudio</depend> ***/ #include <stdio.h> |