From 4f299de252e58bdb89b2ee9fd0dc3639c6ee16a9 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 6 Jun 2005 03:04:58 +0000 Subject: major Makefile and build process improvements, including removal of all hardcoded paths (modules must now use run-time paths as they should) (bug #4116) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5855 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_adsiprog.c | 1 - apps/app_chanspy.c | 4 +--- apps/app_directory.c | 1 - apps/app_hasnewvoicemail.c | 2 +- apps/app_ices.c | 2 +- apps/app_math.c | 2 +- apps/app_meetme.c | 1 - apps/app_queue.c | 2 +- apps/app_sms.c | 2 +- apps/app_test.c | 2 +- apps/app_voicemail.c | 1 - 11 files changed, 7 insertions(+), 13 deletions(-) (limited to 'apps') diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index c6b451a30..fbd6c927e 100755 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -31,7 +31,6 @@ #include #include "asterisk.h" -#include "astconf.h" static char *tdesc = "Asterisk ADSI Programming Application"; diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 292a1518a..656b76947 100755 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -30,8 +30,6 @@ #include "asterisk/module.h" #include "asterisk/lock.h" -#define AST_MONITOR_DIR AST_SPOOL_DIR "/monitor" - AST_MUTEX_DEFINE_STATIC(modlock); #define ast_fit_in_short(in) (in < -32768 ? -32768 : in > 32767 ? 32767 : in) @@ -704,7 +702,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) if (recbase) { char filename[512]; - snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",AST_MONITOR_DIR, recbase, time(NULL)); + snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",ast_config_AST_MONITOR_DIR, recbase, time(NULL)); if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC)) <= 0) { ast_log(LOG_WARNING, "Cannot open %s for recording\n", filename); fd = 0; diff --git a/apps/app_directory.c b/apps/app_directory.c index b73e53979..870fd5a69 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -25,7 +25,6 @@ #include #include #include "asterisk.h" -#include "astconf.h" static char *tdesc = "Extension Directory"; static char *app = "Directory"; diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index 63102de08..7dc3980a4 100755 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -45,7 +45,7 @@ #include #include -#include "astconf.h" +#include "asterisk.h" static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder."; static char *app_hasvoicemail = "HasVoicemail"; diff --git a/apps/app_ices.c b/apps/app_ices.c index c5ffa45fd..6e1629d41 100755 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -27,7 +27,7 @@ #include #include #include -#include "astconf.h" +#include "asterisk.h" #define ICES "/usr/bin/ices" #define LOCAL_ICES "/usr/local/bin/ices" diff --git a/apps/app_math.c b/apps/app_math.c index 0e0b6304d..9d040ff5e 100755 --- a/apps/app_math.c +++ b/apps/app_math.c @@ -38,7 +38,7 @@ #include "asterisk/translate.h" #include #include -#include "astconf.h" +#include "asterisk.h" static char *tdesc = "Basic Math Functions"; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index afd39f279..c7b1c920d 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -33,7 +33,6 @@ #include #include #include "asterisk.h" -#include "astconf.h" #ifdef __linux__ #include diff --git a/apps/app_queue.c b/apps/app_queue.c index 9add78a4d..0e759aa24 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -67,7 +67,7 @@ #include #include -#include "astconf.h" +#include "asterisk.h" #define QUEUE_STRATEGY_RINGALL 0 #define QUEUE_STRATEGY_ROUNDROBIN 1 diff --git a/apps/app_sms.c b/apps/app_sms.c index f2a6c7569..93b7d15c2 100755 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -27,7 +27,7 @@ #include #include #include -#include "astconf.h" +#include "asterisk.h" /* output using Alaw rather than linear */ /* #define OUTALAW */ diff --git a/apps/app_test.c b/apps/app_test.c index 370c547fd..2d9a075a2 100755 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -26,7 +26,7 @@ #include #include #include -#include "astconf.h" +#include "asterisk.h" static char *tdesc = "Interface Test Application"; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 39ab1cc8b..57f06e1df 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -48,7 +48,6 @@ #include #include "asterisk.h" -#include "astconf.h" #define COMMAND_TIMEOUT 5000 -- cgit v1.2.3