[Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.10, 1.11 app_chanspy.c, 1.16, 1.17 app_directory.c, 1.36, 1.37 app_hasnewvoicemail.c, 1.12, 1.13 app_ices.c, 1.5, 1.6 app_math.c, 1.7, 1.8 app_meetme.c, 1.97, 1.98 app_queue.c, 1.140, 1.141 app_sms.c, 1.20, 1.21 app_test.c, 1.8, 1.9 app_voicemail.c, 1.215, 1.216

kpfleming at lists.digium.com kpfleming at lists.digium.com
Sun Jun 5 23:02:27 CDT 2005


Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv5101/apps

Modified Files:
	app_adsiprog.c app_chanspy.c app_directory.c 
	app_hasnewvoicemail.c app_ices.c app_math.c app_meetme.c 
	app_queue.c app_sms.c app_test.c app_voicemail.c 
Log Message:
major Makefile and build process improvements, including removal of all hardcoded paths (modules must now use run-time paths as they should) (bug #4116)


Index: app_adsiprog.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_adsiprog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_adsiprog.c	21 Apr 2005 06:02:43 -0000	1.10
+++ app_adsiprog.c	6 Jun 2005 03:04:58 -0000	1.11
@@ -31,7 +31,6 @@
 #include <errno.h>
 
 #include "asterisk.h"
-#include "astconf.h"
 
 static char *tdesc = "Asterisk ADSI Programming Application";
 

Index: app_chanspy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- app_chanspy.c	26 May 2005 16:05:07 -0000	1.16
+++ app_chanspy.c	6 Jun 2005 03:04:58 -0000	1.17
@@ -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 @@
 
 	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;

Index: app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- app_directory.c	7 May 2005 12:49:36 -0000	1.36
+++ app_directory.c	6 Jun 2005 03:04:58 -0000	1.37
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "asterisk.h"
-#include "astconf.h"
 
 static char *tdesc = "Extension Directory";
 static char *app = "Directory";

Index: app_hasnewvoicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_hasnewvoicemail.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_hasnewvoicemail.c	21 Apr 2005 06:02:43 -0000	1.12
+++ app_hasnewvoicemail.c	6 Jun 2005 03:04:58 -0000	1.13
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <dirent.h>
 
-#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";

Index: app_ices.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_ices.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- app_ices.c	21 Apr 2005 06:02:43 -0000	1.5
+++ app_ices.c	6 Jun 2005 03:04:58 -0000	1.6
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <errno.h>
-#include "astconf.h"
+#include "asterisk.h"
 
 #define ICES "/usr/bin/ices"
 #define LOCAL_ICES "/usr/local/bin/ices"

Index: app_math.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_math.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_math.c	21 Apr 2005 06:02:43 -0000	1.7
+++ app_math.c	6 Jun 2005 03:04:58 -0000	1.8
@@ -38,7 +38,7 @@
 #include "asterisk/translate.h"
 #include <ctype.h>
 #include <sys/file.h>
-#include "astconf.h"
+#include "asterisk.h"
 
 static char *tdesc = "Basic Math Functions";
 

Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- app_meetme.c	19 May 2005 01:09:46 -0000	1.97
+++ app_meetme.c	6 Jun 2005 03:04:58 -0000	1.98
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include "asterisk.h"
-#include "astconf.h"
 
 #ifdef __linux__
 #include <linux/zaptel.h>

Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- app_queue.c	2 Jun 2005 21:42:49 -0000	1.140
+++ app_queue.c	6 Jun 2005 03:04:58 -0000	1.141
@@ -67,7 +67,7 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
-#include "astconf.h"
+#include "asterisk.h"
 
 #define QUEUE_STRATEGY_RINGALL		0
 #define QUEUE_STRATEGY_ROUNDROBIN	1

Index: app_sms.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sms.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- app_sms.c	29 Apr 2005 16:13:04 -0000	1.20
+++ app_sms.c	6 Jun 2005 03:04:58 -0000	1.21
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <ctype.h>
-#include "astconf.h"
+#include "asterisk.h"
 
 /* output using Alaw rather than linear */
 /* #define OUTALAW */

Index: app_test.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_test.c	21 Apr 2005 06:02:43 -0000	1.8
+++ app_test.c	6 Jun 2005 03:04:58 -0000	1.9
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "astconf.h"
+#include "asterisk.h"
 
 
 static char *tdesc = "Interface Test Application";

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- app_voicemail.c	17 May 2005 17:19:53 -0000	1.215
+++ app_voicemail.c	6 Jun 2005 03:04:58 -0000	1.216
@@ -48,7 +48,6 @@
 #include <dirent.h>
 
 #include "asterisk.h"
-#include "astconf.h"
 
 #define COMMAND_TIMEOUT 5000
 




More information about the svn-commits mailing list