diff options
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | agi/Makefile | 2 | ||||
-rwxr-xr-x | apps/Makefile | 2 | ||||
-rwxr-xr-x | astman/Makefile | 2 | ||||
-rwxr-xr-x | cdr/Makefile | 2 | ||||
-rwxr-xr-x | channels/Makefile | 2 | ||||
-rwxr-xr-x | codecs/gsm/inc/config.h | 18 | ||||
-rwxr-xr-x | codecs/gsm/src/code.c | 6 | ||||
-rwxr-xr-x | db1-ast/Makefile | 2 | ||||
-rwxr-xr-x | formats/Makefile | 2 | ||||
-rwxr-xr-x | pbx/Makefile | 2 | ||||
-rwxr-xr-x | res/Makefile | 2 |
12 files changed, 30 insertions, 14 deletions
@@ -171,7 +171,9 @@ db1-ast/libdb1.a: exit 1; \ fi +ifneq ($(wildcard .depend),) include .depend +endif _version: if [ -d CVS ] && ! [ -f .version ]; then echo "CVS-`date +"%D-%T"`" > .version; fi diff --git a/agi/Makefile b/agi/Makefile index c1b35de44..1257e6a78 100755 --- a/agi/Makefile +++ b/agi/Makefile @@ -32,7 +32,9 @@ clean: %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif depend: .depend diff --git a/apps/Makefile b/apps/Makefile index eee14d522..3f7383174 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -75,7 +75,9 @@ app_sql_odbc.so: app_sql_odbc.o look: look.c gcc -pipe -O6 -g look.c -o look -lncurses +ifneq ($(wildcard .depend),) include .depend +endif depend: .depend diff --git a/astman/Makefile b/astman/Makefile index 7b9d20f6f..18d924057 100755 --- a/astman/Makefile +++ b/astman/Makefile @@ -21,7 +21,9 @@ clean: astman: astman.o ../md5.o $(CC) -o astman astman.o ../md5.o -lnewt +ifneq ($(wildcard .depend),) include .depend +endif depend: .depend diff --git a/cdr/Makefile b/cdr/Makefile index 66c7e07a8..00f7c8066 100755 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -40,7 +40,9 @@ clean: %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif cdr_mysql.so: cdr_mysql.o $(CC) -shared -Xlinker -x -o $@ $< -lmysqlclient -lz $(MLFLAGS) diff --git a/channels/Makefile b/channels/Makefile index ba5165d7f..a655df07e 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -73,7 +73,9 @@ clean: %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif gentone: gentone.c $(CC) -o gentone gentone.c -lm diff --git a/codecs/gsm/inc/config.h b/codecs/gsm/inc/config.h index ef1bfcdae..9fe31fdf1 100755 --- a/codecs/gsm/inc/config.h +++ b/codecs/gsm/inc/config.h @@ -9,29 +9,29 @@ #ifndef CONFIG_H #define CONFIG_H -/*efine SIGHANDLER_T int /* signal handlers are void */ -/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ +//#define SIGHANDLER_T int /* signal handlers are void */ +//#define HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ +//#define HAS_LIMITS_H 1 /* /usr/include/limits.h */ #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ +//#define HAS_ERRNO_DECL 1 /* errno.h declares errno */ #define HAS_FSTAT 1 /* fstat syscall */ #define HAS_FCHMOD 1 /* fchmod syscall */ #define HAS_CHMOD 1 /* chmod syscall */ #define HAS_FCHOWN 1 /* fchown syscall */ #define HAS_CHOWN 1 /* chown syscall */ -/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ +//#define HAS__FSETMODE 1 /* _fsetmode -- set file mode */ #define HAS_STRING_H 1 /* /usr/include/string.h */ -/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ +//#define HAS_STRINGS_H 1 /* /usr/include/strings.h */ #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ #define HAS_UTIME 1 /* POSIX utime(path, times) */ -/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ +//#define HAS_UTIMES 1 /* use utimes() syscall instead */ #define HAS_UTIME_H 1 /* UTIME header file */ -/*efine HAS_UTIMBUF 1 /* struct utimbuf */ -/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ +//#define HAS_UTIMBUF 1 /* struct utimbuf */ +//#define HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ #endif /* CONFIG_H */ diff --git a/codecs/gsm/src/code.c b/codecs/gsm/src/code.c index 739554294..4d195dfbd 100755 --- a/codecs/gsm/src/code.c +++ b/codecs/gsm/src/code.c @@ -8,9 +8,8 @@ #include "config.h" - -#ifdef HAS_STDLIB_H -#include <stdlib.h> +#ifdef HAS_STRING_H +#include <string.h> #else # include "proto.h" extern char * memcpy P((char *, char *, int)); @@ -86,7 +85,6 @@ void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc), */ { register int i; - register longword ltmp; for (i = 0; i <= 39; i++) dp[ i ] = GSM_ADD( e[5 + i], dpp[i] ); } diff --git a/db1-ast/Makefile b/db1-ast/Makefile index 8a945c270..0bb8ea5c5 100755 --- a/db1-ast/Makefile +++ b/db1-ast/Makefile @@ -40,7 +40,7 @@ clean: rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS) OORG= -O2 -CL= $(CC) -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude +CL= $(CC) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude db_dump185.o: db_dump185.c $(CL) -o $@ $< diff --git a/formats/Makefile b/formats/Makefile index 37242bc0d..4ee85f489 100755 --- a/formats/Makefile +++ b/formats/Makefile @@ -32,7 +32,9 @@ clean: %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif format_mp3.so : format_mp3.o $(CC) -shared -Xlinker -x -o $@ $< -lm diff --git a/pbx/Makefile b/pbx/Makefile index 502fee111..96ae7e372 100755 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -57,7 +57,9 @@ pbx_kdeconsole.so: $(KDE_CONSOLE_OBJS) %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif install: all for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done diff --git a/res/Makefile b/res/Makefile index 136c54b88..314d94da8 100755 --- a/res/Makefile +++ b/res/Makefile @@ -36,7 +36,9 @@ clean: %.so : %.o $(CC) -shared -Xlinker -x -o $@ $< +ifneq ($(wildcard .depend),) include .depend +endif depend: .depend |