From 170dae49be63222c93841e0cc4b12598a8b47388 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Fri, 29 Sep 2006 18:54:21 +0000 Subject: Merged revisions 43996-43997,44008,44011-44012 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines another cross-compile fix ........ r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines support --without-curl in configure script ........ r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead ........ r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines missed one conversion to ASTCFLAGS ........ r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines yet another place where we were not using the correct CFLAGS by default ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44013 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile.rules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index b179ae626..cdad748df 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -33,19 +33,19 @@ ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) #K6OPT=-DK6OPT OPTIMIZE?=-O6 -CFLAGS+=$(OPTIMIZE) +ASTCFLAGS+=$(OPTIMIZE) endif define ast_make_o_c $(1): $(2) $(ECHO_PREFIX) echo " [CC] $$< -> $$@" - $(CMD_PREFIX) $$(CC) -o $$@ -c $$< $$(CFLAGS) + $(CMD_PREFIX) $$(CC) -o $$@ -c $$< $$(ASTCFLAGS) endef define ast_make_oo_cc $(1): $(2) $(ECHO_PREFIX) echo " [CXX] $$< -> $$@" - $(CMD_PREFIX) $$(CXX) -o $$@ -c $$< $$(CFLAGS) + $(CMD_PREFIX) $$(CXX) -o $$@ -c $$< $$(ASTCFLAGS) endef define ast_make_c_y @@ -63,13 +63,13 @@ endef define ast_make_so_o $(1): $(2) $(ECHO_PREFIX) echo " [LD] $$^ -> $$@" - $(CMD_PREFIX) $$(CC) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS) + $(CMD_PREFIX) $$(CC) $$(STATIC_BUILD) -o $$@ $$(ASTLDFLAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_so_oo $(1): $(2) $(ECHO_PREFIX) echo " [LDXX] $$^ -> $$@" - $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$(SOLINK) $$^ $$(LIBS) + $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(ASTLDFLAGS) $$(SOLINK) $$^ $$(LIBS) endef define ast_make_a_o @@ -82,13 +82,13 @@ endef define ast_make_final $(1): $(2) $(ECHO_PREFIX) echo " [LD] $$^ -> $$@" - $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(LDFLAGS) $$^ $$(LIBS) + $(CMD_PREFIX) $$(CXX) $$(STATIC_BUILD) -o $$@ $$(ASTLDFLAGS) $$^ $$(LIBS) endef define ast_make_final_host $(1): $(2) $(ECHO_PREFIX) echo " [LD] $$^ -> $$@" - $(CMD_PREFIX) $$(HOST_CC) $$(STATIC_BUILD) -o $$@ $$(CFLAGS) $$(LDFLAGS) $$^ $$(LIBS) + $(CMD_PREFIX) $$(HOST_CC) $$(STATIC_BUILD) -o $$@ $$(HOST_CFLAGS) $$(HOST_LDFLAGS) $$^ $$(LIBS) endef $(eval $(call ast_make_o_c,%.o,%.c)) -- cgit v1.2.3