diff options
Diffstat (limited to 'formats')
-rw-r--r-- | formats/Makefile | 39 | ||||
-rw-r--r-- | formats/format_ogg_vorbis.c | 2 |
2 files changed, 3 insertions, 38 deletions
diff --git a/formats/Makefile b/formats/Makefile index 8440aa0dd..351f1e8a1 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -5,51 +5,16 @@ # # Copyright (C) 1999-2006, Digium, Inc. # -# Mark Spencer <markster@digium.com> -# # This program is free software, distributed under the terms of # the GNU General Public License # -.PHONY: clean clean-depend all depend uninstall - ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts endif SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c))) -GSMLIB=../codecs/gsm/lib/libgsm.a - -MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) - -all: $(MODS) - -clean-depend: - rm -f .depend - -clean: clean-depend - rm -f *.so *.o - -%.so : %.o - $(CC) $(SOLINK) -o $@ $< - -ifneq ($(wildcard .depend),) - include .depend -endif - -format_ogg_vorbis.so : format_ogg_vorbis.o - $(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 - -uninstall: - -depend: .depend +all: _all -.depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c` +include ../Makefile.rules diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index d3959745e..a9f926251 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -23,7 +23,7 @@ /*** MODULEINFO <depend>libvorbis</depend> - <depend>ogg</depend> + <depend>libogg</depend> ***/ #include "asterisk.h" |