From 661a4f572c9bb0b935848a4a906795c18483bfe2 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 15 Jul 2006 16:40:05 +0000 Subject: 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 --- Makefile.rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 5a0153e6e..4982b2d3b 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -40,13 +40,13 @@ endef define ast_make_so_o $(1): $(2) @echo " [LD] $$^ -> $$@" - @$$(CC) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS) + @$$(CC) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_so_oo $(1): $(2) @echo " [LDXX] $$^ -> $$@" - @$$(CXX) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS) + @$$(CXX) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_a_o @@ -59,13 +59,13 @@ endef define ast_make_final $(1): $(2) @echo " [LD] $$^ -> $$@" - @$$(CC) -o $$@ $$^ $$(LDFLAGS) + @$$(CC) -o $$@ $$(LDFLAGS) $$^ $$(LIBS) endef define ast_make_final_host $(1): $(2) @echo " [LD] $$^ -> $$@" - @$$(HOST_CC) -o $$@ $$^ $$(CFLAGS) $$(LDFLAGS) + @$$(HOST_CC) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS) endef else @@ -92,12 +92,12 @@ endef define ast_make_so_o $(1): $(2) - $$(CC) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS) + $$(CC) -o $$@ $$(LDFAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_so_oo $(1): $(2) - $$(CXX) -o $$@ $$(SOLINK) $$^ $$(LDFLAGS) + $$(CXX) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_a_o @@ -108,12 +108,12 @@ endef define ast_make_final $(1): $(2) - $$(CC) -o $$@ $$^ $$(LDFLAGS) + $$(CC) -o $$@ $$(LDFLAGS) $$^ $$(LIBS) endef define ast_make_final_host $(1): $(2) - $$(HOST_CC) -o $$@ $$^ $$(CFLAGS) $$(LDFLAGS) + $$(HOST_CC) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS) endef endif -- cgit v1.2.3