diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-24 19:43:31 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-24 19:43:31 +0000 |
| commit | 41af2260b79cbef918e170240ece6fd38962011c (patch) | |
| tree | c9ee092b1529897cefb9171ca38ad1c5f74d293a /formats | |
| parent | 3df43d0174f5ed6d1521ddc2f0d460d690fcd19b (diff) | |
The Eurostar Commit! (it's amazing how much work you can get done on a 150 minute train ride from Paris to London <G>)
support the new location for zaptel.h and tonezone.h
use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries
combine the common rules into a top-level Makefile.rules file
remove all (now) unnecessary stuff from subdir Makefiles
change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory)
alphabetize --with-<foo> options in configure script
enhance Net-SNMP support in configure script to provide a --with-netsnmp option
fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated
add 'optional package' usage to modules now that menuselect can output it
allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35832 f38db490-d61c-443f-a65b-d21fe96a405b
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" |