[Asterisk-cvs] asterisk-addons mkdep,NONE,1.1 Makefile,1.1.1.1,1.2 cdr_mysql.c,1.1.1.1,1.2

[markster at lists.digium.com]

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

Modified Files:
	Makefile cdr_mysql.c 
Added Files:
	mkdep 
Log Message:
Fix build


--- NEW FILE: mkdep ---
#!/bin/sh -
#
#	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
#	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
#
# Copyright (c) 1991, 1993
#	The Regents of the University of California.  All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
#    must display the following acknowledgement:
#	This product includes software developed by the University of
#	California, Berkeley and its contributors.
# 4. Neither the name of the University nor the names of its contributors
#    may be used to endorse or promote products derived from this software
#    without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
#	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
#

D=.depend			# default dependency file is .depend
append=0
pflag=

while :
	do case "$1" in
		# -a appends to the depend file
		-a)
			append=1
			shift ;;

		# -f allows you to select a makefile name
		-f)
			D=$2
			shift; shift ;;

		# the -p flag produces "program: program.c" style dependencies
		# so .o's don't get produced
		-p)
			pflag=p
			shift ;;
		*)
			break ;;
	esac
done

if [ $# = 0 ] ; then
	echo 'usage: mkdep [-p] [-f depend_file] [cc_flags] file ...'
	exit 1
fi

DTMP=/tmp/mkdep$$
TMP=$DTMP/mkdep

um=`umask`
umask 022
if ! mkdir $DTMP ; then
	echo failed to create tmp dir $DTMP
	exit 1
fi

umask $um
trap 'rm -rf $DTMP ; trap 2 ; kill -2 $$' 1 2 3 13 15

if [ x$pflag = x ]; then
	${CC:-cc} -M "$@" | sed -e 's; \./; ;g' > $TMP
else
	${CC:-cc} -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
fi

if [ $? != 0 ]; then
	echo 'mkdep: compile failed.'
	rm -rf $DTMP
	exit 1
fi

if [ $append = 1 ]; then
	cat $TMP >> $D
	if [ $? != 0 ]; then
		echo 'mkdep: append failed.'
		rm -rf $DTMP
		exit 1
	fi
else
	mv $TMP $D
	if [ $? != 0 ]; then
		echo 'mkdep: rename failed.'
		rm -rf $DTMP
		exit 1
	fi
fi

rm -rf $DTMP
exit 0

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	26 Sep 2003 22:50:59 -0000	1.1.1.1
+++ Makefile	26 Sep 2003 22:53:21 -0000	1.2
@@ -14,6 +14,7 @@
 MODS=
 
 CFLAGS+=-fPIC
+CFLAGS+=-I../asterisk
 
 #
 # MySQL stuff...  Autoconf anyone??
@@ -50,4 +51,4 @@
 depend: .depend
 
 .depend:
-	../mkdep $(CFLAGS) `ls *.c`
+	./mkdep $(CFLAGS) `ls *.c`

Index: cdr_mysql.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/cdr_mysql.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cdr_mysql.c	26 Sep 2003 22:50:59 -0000	1.1.1.1
+++ cdr_mysql.c	26 Sep 2003 22:53:21 -0000	1.2
@@ -20,7 +20,7 @@
 #include <asterisk/cdr.h>
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
-#include "../asterisk.h"
+#include "asterisk.h"
 
 #include <stdio.h>
 #include <string.h>