diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 16:40:05 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 16:40:05 +0000 |
| commit | 661a4f572c9bb0b935848a4a906795c18483bfe2 (patch) | |
| tree | 6710f23464cdc313d919ab803aae67e1d4f9b631 /Makefile.rules | |
| parent | 18ef9dd960b9656b33fc11c6ae01a990ceed44d4 (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 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 16 |
1 files changed, 8 insertions, 8 deletions
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 |