Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename ARCH define because of conflict with some systems. see (FS#9321)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18379 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-09-01 19:48:27 +00:00
parent 736af6f33f
commit da207a2715
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tools/rbspeex/Makefile
View file

@ -27,15 +27,15 @@ ifeq ($(findstring MINGW,$(shell uname)),MINGW)
CC = gcc CC = gcc
endif endif
ifdef ARCH ifdef RBARCH
CFLAGS += -arch $(ARCH) CFLAGS += -arch $(RBARCH)
endif endif
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$") SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$")
OUT = build$(ARCH) OUT = build$(RBARCH)
SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c
OBJS = $(addprefix $(OUT)/,$(SRC:%.c=%.o)) OBJS = $(addprefix $(OUT)/,$(SRC:%.c=%.o))
DEPFILE = $(OUT)/dep-speex DEPFILE = $(OUT)/dep-speex
@ -62,31 +62,31 @@ $(DEPFILE): $(SOURCES) $(OUT)
-include $(DEPFILE) -include $(DEPFILE)
$(OUT)/librbspeex.a: $(OBJS) $(DEPFILE) $(OUT)/rbspeex.o $(OUT)/librbspeex.a: $(OBJS) $(DEPFILE) $(OUT)/rbspeex.o
@echo AR $(OUT)/librbspeex$(ARCH).a @echo AR $(OUT)/librbspeex$(RBARCH).a
$(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1 $(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1
librbspeex$(ARCH).a: $(OUT)/librbspeex.a librbspeex$(RBARCH).a: $(OUT)/librbspeex.a
$(SILENT)cp $(OUT)/librbspeex.a librbspeex$(ARCH).a $(SILENT)cp $(OUT)/librbspeex.a librbspeex$(RBARCH).a
../rbspeexenc: $(OBJS) $(OUT)/rbspeexenc.o librbspeex$(ARCH).a ../rbspeexenc: $(OBJS) $(OUT)/rbspeexenc.o librbspeex$(RBARCH).a
@echo Linking ../rbspeexenc @echo Linking ../rbspeexenc
$(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc $(OUT)/rbspeexenc.o librbspeex$(ARCH).a -lm $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc $(OUT)/rbspeexenc.o librbspeex$(RBARCH).a -lm
../rbspeexdec: $(OBJS) librbspeex$(ARCH).a $(OUT)/rbspeexdec.o ../rbspeexdec: $(OBJS) librbspeex$(RBARCH).a $(OUT)/rbspeexdec.o
@echo Linking ../rbspeexdec @echo Linking ../rbspeexdec
$(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec $(OUT)/rbspeexdec.o librbspeex$(ARCH).a -lm $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec $(OUT)/rbspeexdec.o librbspeex$(RBARCH).a -lm
%.o: %.o:
@echo CC $< @echo CC $<
$(SILENT)$(CC) $(CFLAGS) -c $< -o $@ $(SILENT)$(CC) $(CFLAGS) -c $< -o $@
# some trickery to build ppc and i386 from a single call # some trickery to build ppc and i386 from a single call
ifeq ($(ARCH),) ifeq ($(RBARCH),)
librbspeexi386.a: librbspeexi386.a:
make ARCH=i386 librbspeexi386.a make RBARCH=i386 librbspeexi386.a
librbspeexppc.a: librbspeexppc.a:
make ARCH=ppc librbspeexppc.a make RBARCH=ppc librbspeexppc.a
endif endif
librbspeex-universal: librbspeexi386.a librbspeexppc.a librbspeex-universal: librbspeexi386.a librbspeexppc.a
@ -98,7 +98,7 @@ clean:
rm -f $(OBJS) librbspeex* ../rbspeexenc ../rbspeexdec dep-speex rm -f $(OBJS) librbspeex* ../rbspeexenc ../rbspeexdec dep-speex
rm -rf build* rm -rf build*
build$(ARCH): build$(RBARCH):
@echo MKDIR build$(ARCH) @echo MKDIR build$(RBARCH)
$(SILENT)mkdir build$(ARCH) $(SILENT)mkdir build$(RBARCH)