diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 82 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 5 | ||||
| -rw-r--r-- | res/res_snmp.c | 1 |
3 files changed, 5 insertions, 83 deletions
diff --git a/res/Makefile b/res/Makefile index 4c92c5e7c..3fc5a406b 100644 --- a/res/Makefile +++ b/res/Makefile @@ -3,16 +3,12 @@ # # Makefile for resource modules # -# Copyright (C) 1999-2006, Digium -# -# Mark Spencer <markster@digium.com> +# Copyright (C) 1999-2006, Digium, Inc. # # 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 @@ -23,80 +19,10 @@ ifeq ($(OSARCH),FreeBSD) SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_MODS)) endif -MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) - -all: $(MODS) - -install: all - for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ - echo "*** You have the WRONG version of mpg123... you need .59r ***";\ - echo "*** Use 'make mpg123' to get the right verison ***";\ - echo "*************************************************************";\ - fi ;\ - else \ - echo "*** You don't have mpg123 installed. You may need ***";\ - echo "*** it if you want to use MusicOnHold ***";\ - fi - -uninstall: - -res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(SSL_LIB) +all: _all -res_crypto.o: res_crypto.c - $(CC) -c -o $@ $(CFLAGS) $(SSL_INCLUDE) $< +include ../Makefile.rules -clean-depend: - rm -f .depend - -clean: clean-depend - rm -f *.so *.o +clean:: rm -f snmp/*.o -res_odbc.so: res_odbc.o - $(CC) $(SOLINK) -o $@ $< $(ODBC_LIB) - -res_odbc.o: res_odbc.c - $(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $< - -res_jabber.o: res_jabber.c - $(CC) -c -o $@ $(CFLAGS) $(IKSEMEL_INCLUDE) $< - -res_jabber.so: res_jabber.o - $(CC) $(SOLINK) -o $@ $< $(IKSEMEL_LIB) - -res_osp.so: res_osp.o - $(CC) $(SOLINK) -o $@ $< $(OSPTK_LIB) - -res_osp.o: res_osp.c - $(CC) -c -o $@ $(CFLAGS) $(OSPTK_INCLUDE) $< - -%.so : %.o - $(CC) -o $@ $(SOLINK) $< - -res_config_odbc.o: res_config_odbc.c - $(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $< - -res_snmp.so: res_snmp.o snmp/agent.o - $(CC) $(SOLINK) -o $@ $^ $(NETSNMP_LIBS) - -res_config_pgsql.so: res_config_pgsql.o - $(CC) $(SOLINK) -o $@ $< $(PGSQL_LIB) - -res_config_pgsql.o: res_config_pgsql.c - $(CC) -c -o $@ $(CFLAGS) $(PGSQL_INCLUDE) $< - -ifneq ($(wildcard .depend),) - include .depend -endif - -depend: .depend - -.depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c` - -env: - env diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index b19fb69fc..379f33c4e 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -27,6 +27,7 @@ /*** MODULEINFO <conflict>win32</conflict> + <use>zaptel</use> ***/ #include "asterisk.h" @@ -49,11 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #ifdef HAVE_ZAPTEL -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #endif #include "asterisk/lock.h" diff --git a/res/res_snmp.c b/res/res_snmp.c index bacc43962..3848e9330 100644 --- a/res/res_snmp.c +++ b/res/res_snmp.c @@ -16,7 +16,6 @@ /*** MODULEINFO <depend>netsnmp</depend> - <defaultenabled>no</defaultenabled> ***/ #include "asterisk.h" |