diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 45 | ||||
| -rw-r--r-- | apps/app_flash.c | 4 | ||||
| -rw-r--r-- | apps/app_meetme.c | 4 | ||||
| -rw-r--r-- | apps/app_rpt.c | 2 | ||||
| -rw-r--r-- | apps/app_zapbarge.c | 5 | ||||
| -rw-r--r-- | apps/app_zapras.c | 6 | ||||
| -rw-r--r-- | apps/app_zapscan.c | 5 |
7 files changed, 4 insertions, 67 deletions
diff --git a/apps/Makefile b/apps/Makefile index a48477abe..01d70c6af 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,62 +5,23 @@ # # 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_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) -MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) - -app_voicemail.o: CFLAGS+=$(patsubst %,-D%,$(MENUSELECT_app_voicemail)) - -all: $(MODS) - -clean-depend: - rm -f .depend - -clean: clean-depend - rm -f *.so *.o - -%.so: %.o - $(CC) $(SOLINK) -o $@ $< - -app_rpt.so: app_rpt.o - $(CC) $(SOLINK) -o $@ $< $(TONEZONE_LIB) +MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) $(MENUSELECT_DEPENDS_EXTENDED_ODBC_STORAGE) -app_rpt.o: app_rpt.c - $(CC) -c -o $@ $(CFLAGS) $(TONEZONE_INCLUDE) $(ZAPTEL_INCLUDE) $< +all: _all -app_flash.o app_meetme.o app_page.o app_zapbarge.o app_zapras.o app_zapscan.o: %.o: %.c - $(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $< - -install: all - for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done - -uninstall: +include ../Makefile.rules ifeq (SunOS,$(shell uname)) app_chanspy.so: app_chanspy.o $(CC) $(SOLINK) -o $@ $< -lrt endif - -ifneq ($(wildcard .depend),) - include .depend -endif - -depend: .depend - -.depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c` - -env: - env diff --git a/apps/app_flash.c b/apps/app_flash.c index f1e652a6a..a49505210 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -38,11 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <string.h> #include <errno.h> #include <sys/ioctl.h> -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f19ecccf8..16cf7f1a8 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -39,11 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_rpt.c b/apps/app_rpt.c index c18fc2071..506683b31 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -222,8 +222,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/io.h> #include <math.h> +#include <zaptel.h> #include <tonezone.h> -#include <linux/zaptel.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 943d41bb7..2381509bb 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -45,12 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> - -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 95e69ac66..8511c4ea5 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -48,13 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <errno.h> #include <stdio.h> #include <fcntl.h> - -/* Need some zaptel help here */ -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index b4257d8ed..7697f11b1 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -44,12 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <errno.h> #include <sys/ioctl.h> - -#ifdef __linux__ -#include <linux/zaptel.h> -#else #include <zaptel.h> -#endif /* __linux__ */ #include "asterisk/lock.h" #include "asterisk/file.h" |