diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-15 17:16:00 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-15 17:16:00 +0000 |
| commit | fe9ed45b0562df0437454ec3ddd2132ba9fc4c07 (patch) | |
| tree | 3f107f0203614eab20317d4d725f6b03f760b37a /utils | |
| parent | 8d0211a11ec86c3df71f18606e2865d353209753 (diff) | |
Many Solaris fixes - this moves some of the stuff from utils.c to strcompat.c
Every OS uses strcompat now - this was done on purpose.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42982 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/utils/Makefile b/utils/Makefile index d59bfec65..5eae26d1e 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -16,7 +16,7 @@ UTILS:=astman smsq stereorize streamplayer aelparse muted ifeq (${OSARCH},SunOS) - LIBS+=../main/strcompat.o -lsocket -lnsl + LIBS+=-lsocket -lnsl endif ifeq ($(POPT_LIB),) @@ -57,6 +57,8 @@ astman: LIBS+=-lnewt -lslang -ldl $(eval $(call ast_make_final,stereorize,stereorize.o frame.o)) stereorize: LIBS+=-lm +$(eval $(call ast_make_o_c,strcompat.o,../main/strcompat.c)) + ../main/ast_expr2.c: @echo " [BISON] ../main/ast_expr2.y -> $@" @bison -o $@ -d --name-prefix=ast_yy ../main/ast_expr2.y @@ -81,7 +83,7 @@ aelbison.o: CFLAGS+=-I../pbx $(eval $(call ast_make_o_c,pbx_ael.o,../pbx/pbx_ael.c)) pbx_ael.o: CFLAGS+=-DSTANDALONE_AEL -$(eval $(call ast_make_final,aelparse,aelflex.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o)) +$(eval $(call ast_make_final,aelparse,aelflex.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o)) $(eval $(call ast_make_o_c,ael_main.o,ael_main.c ../include/asterisk/ael_structs.h)) @@ -92,7 +94,7 @@ testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h rm ast_expr2.o ast_expr2f.o ./testexpr2s expr2.testinput -smsq: smsq.o +smsq: smsq.o strcompat.o smsq: LIBS+=$(POPT_LIB) streamplayer: streamplayer.o |