aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-15 16:40:05 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-15 16:40:05 +0000
commit661a4f572c9bb0b935848a4a906795c18483bfe2 (patch)
tree6710f23464cdc313d919ab803aae67e1d4f9b631 /utils
parent18ef9dd960b9656b33fc11c6ae01a990ceed44d4 (diff)
use LDFLAGS and LIBS properly, and allow dependencies to provide LDFLAGS if needed (although none do today)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37653 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/utils/Makefile b/utils/Makefile
index f6f24710d..1d7a9512a 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -16,7 +16,7 @@
UTILS:=astman smsq stereorize streamplayer aelparse
ifeq (${OSARCH},SunOS)
- LDFLAGS+=../strcompat.o -lsocket -lnsl
+ LIBS+=../strcompat.o -lsocket -lnsl
endif
ifeq ($(POPT_LIB),)
@@ -51,11 +51,11 @@ clean-depend:
clean: clean-depend
rm -f *.o $(UTILS) check_expr
-astman: astman.o ../md5.o
-astman: LDFLAGS+=-lnewt
+$(eval $(call ast_make_final,astman,astman.o ../md5.o))
+astman: LIBS+=-lnewt
-stereorize: stereorize.o frame.o
-stereorize: LDFLAGS+=-lm
+$(eval $(call ast_make_final,stereorize,stereorize.o frame.o))
+stereorize: LIBS+=-lm
../ast_expr2.c:
@echo " [BISON] ../ast_expr2.y -> $@"
@@ -92,7 +92,7 @@ testexpr2s: ../ast_expr2f.c ../ast_expr2.c ../ast_expr2.h
./testexpr2s expr2.testinput
smsq: smsq.o
-smsq: LDFLAGS+=-lpopt
+smsq: LIBS+=-lpopt
streamplayer: streamplayer.o
@@ -104,4 +104,3 @@ depend: .depend
.depend:
../build_tools/mkdep $(CFLAGS) `ls *.c`
-