diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
| commit | 170dae49be63222c93841e0cc4b12598a8b47388 (patch) | |
| tree | 90d8fe328a1e6371e95020100dad8cd49eb55be0 /main/db1-ast | |
| parent | 18f0e3efb46368cfa21125c19a9a76cf678d17ca (diff) | |
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
Diffstat (limited to 'main/db1-ast')
| -rw-r--r-- | main/db1-ast/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/db1-ast/Makefile b/main/db1-ast/Makefile index 3e5a6fb2d..4fb92fc3c 100644 --- a/main/db1-ast/Makefile +++ b/main/db1-ast/Makefile @@ -10,7 +10,7 @@ endif #Added support for UltraSparc - Belgarath ifeq ($(ARCH),sparc64) PROC=ultrasparc -CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8 +ASTCFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8 endif ifeq ($(OSARCH),Darwin) @@ -50,11 +50,11 @@ clean-depend: clean: rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS) -CFLAGS+=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno +ASTCFLAGS+=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno OSTYPE=$(shell uname -s) ifeq ($(OSTYPE),SunOS) -CFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS +ASTCFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS endif db_dump185.o: db_dump185.c |