diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
| commit | 29f496ef12247a2401d02428fa533020b588f5b6 (patch) | |
| tree | 170532911902642fdae405ec644509398b0b6ee5 /formats | |
| parent | 3cbcc049473cb374710364337d0d415c56133b0e (diff) | |
Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
| -rw-r--r-- | formats/Makefile | 28 | ||||
| -rw-r--r-- | formats/format_ogg_vorbis.c | 6 |
2 files changed, 12 insertions, 22 deletions
diff --git a/formats/Makefile b/formats/Makefile index 2d3b24aa3..dab3a3922 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -11,26 +11,10 @@ # the GNU General Public License # -MODS:=$(patsubst %.c,%.so,$(wildcard format_*.c)) - -# OGG/Vorbis format -# (on FreeBSD is in /usr/local/include/... - -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/vorbis/codec.h),) - MODS:=$(filter-out format_ogg_vorbis.so,$(MODS)) -endif -endif +MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%.so,$(wildcard format_*.c))) GSMLIB=../codecs/gsm/lib/libgsm.a -ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols - CYGSOLIB=-L.. -L. -lasterisk.dll -else - CFLAGS+=-fPIC -endif - all: depend $(MODS) clean-depend: @@ -40,17 +24,17 @@ clean: clean-depend rm -f *.so *.o %.so : %.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} + $(CC) $(SOLINK) -o $@ $< ifneq ($(wildcard .depend),) include .depend endif -format_mp3.so : format_mp3.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm - format_ogg_vorbis.so : format_ogg_vorbis.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm + $(CC) $(SOLINK) -o $@ $< $(OGG_LIB) $(VORBIS_LIB) + +format_ogg_vorbis.o: format_ogg_vorbis.c + $(CC) -c -o $@ $(CFLAGS) $(OGG_INCLUDE) $(VORBIS_INCLUDE) $< install: all for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 69a43f0fd..97b1b4562 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -21,6 +21,11 @@ * \ingroup formats */ +/*** MODULEINFO + <depend>libvorbis</depend> + <depend>ogg</depend> + ***/ + #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -561,3 +566,4 @@ static const char *key(void) } STD_MOD1; + |