diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2008-09-01 19:48:27 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2008-09-01 19:48:27 +0000 |
commit | da207a27152f3b4fbc9867eefe32e90f510777bf (patch) | |
tree | a4726e83ff1a1115425477cadc8151881ddf14c4 | |
parent | 736af6f33f21c4830901c26efd01f17bed381731 (diff) | |
download | rockbox-da207a27152f3b4fbc9867eefe32e90f510777bf.tar.gz rockbox-da207a27152f3b4fbc9867eefe32e90f510777bf.zip |
rename ARCH define because of conflict with some systems. see (FS#9321)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18379 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | tools/rbspeex/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 383acc986a..c11ae29b04 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile | |||
@@ -27,15 +27,15 @@ ifeq ($(findstring MINGW,$(shell uname)),MINGW) | |||
27 | CC = gcc | 27 | CC = gcc |
28 | endif | 28 | endif |
29 | 29 | ||
30 | ifdef ARCH | 30 | ifdef RBARCH |
31 | CFLAGS += -arch $(ARCH) | 31 | CFLAGS += -arch $(RBARCH) |
32 | endif | 32 | endif |
33 | 33 | ||
34 | 34 | ||
35 | # This sets up 'SRC' based on the files mentioned in SOURCES | 35 | # This sets up 'SRC' based on the files mentioned in SOURCES |
36 | SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$") | 36 | SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$") |
37 | 37 | ||
38 | OUT = build$(ARCH) | 38 | OUT = build$(RBARCH) |
39 | SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c | 39 | SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c |
40 | OBJS = $(addprefix $(OUT)/,$(SRC:%.c=%.o)) | 40 | OBJS = $(addprefix $(OUT)/,$(SRC:%.c=%.o)) |
41 | DEPFILE = $(OUT)/dep-speex | 41 | DEPFILE = $(OUT)/dep-speex |
@@ -62,31 +62,31 @@ $(DEPFILE): $(SOURCES) $(OUT) | |||
62 | -include $(DEPFILE) | 62 | -include $(DEPFILE) |
63 | 63 | ||
64 | $(OUT)/librbspeex.a: $(OBJS) $(DEPFILE) $(OUT)/rbspeex.o | 64 | $(OUT)/librbspeex.a: $(OBJS) $(DEPFILE) $(OUT)/rbspeex.o |
65 | @echo AR $(OUT)/librbspeex$(ARCH).a | 65 | @echo AR $(OUT)/librbspeex$(RBARCH).a |
66 | $(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1 | 66 | $(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1 |
67 | 67 | ||
68 | librbspeex$(ARCH).a: $(OUT)/librbspeex.a | 68 | librbspeex$(RBARCH).a: $(OUT)/librbspeex.a |
69 | $(SILENT)cp $(OUT)/librbspeex.a librbspeex$(ARCH).a | 69 | $(SILENT)cp $(OUT)/librbspeex.a librbspeex$(RBARCH).a |
70 | 70 | ||
71 | ../rbspeexenc: $(OBJS) $(OUT)/rbspeexenc.o librbspeex$(ARCH).a | 71 | ../rbspeexenc: $(OBJS) $(OUT)/rbspeexenc.o librbspeex$(RBARCH).a |
72 | @echo Linking ../rbspeexenc | 72 | @echo Linking ../rbspeexenc |
73 | $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc $(OUT)/rbspeexenc.o librbspeex$(ARCH).a -lm | 73 | $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc $(OUT)/rbspeexenc.o librbspeex$(RBARCH).a -lm |
74 | 74 | ||
75 | ../rbspeexdec: $(OBJS) librbspeex$(ARCH).a $(OUT)/rbspeexdec.o | 75 | ../rbspeexdec: $(OBJS) librbspeex$(RBARCH).a $(OUT)/rbspeexdec.o |
76 | @echo Linking ../rbspeexdec | 76 | @echo Linking ../rbspeexdec |
77 | $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec $(OUT)/rbspeexdec.o librbspeex$(ARCH).a -lm | 77 | $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec $(OUT)/rbspeexdec.o librbspeex$(RBARCH).a -lm |
78 | 78 | ||
79 | %.o: | 79 | %.o: |
80 | @echo CC $< | 80 | @echo CC $< |
81 | $(SILENT)$(CC) $(CFLAGS) -c $< -o $@ | 81 | $(SILENT)$(CC) $(CFLAGS) -c $< -o $@ |
82 | 82 | ||
83 | # some trickery to build ppc and i386 from a single call | 83 | # some trickery to build ppc and i386 from a single call |
84 | ifeq ($(ARCH),) | 84 | ifeq ($(RBARCH),) |
85 | librbspeexi386.a: | 85 | librbspeexi386.a: |
86 | make ARCH=i386 librbspeexi386.a | 86 | make RBARCH=i386 librbspeexi386.a |
87 | 87 | ||
88 | librbspeexppc.a: | 88 | librbspeexppc.a: |
89 | make ARCH=ppc librbspeexppc.a | 89 | make RBARCH=ppc librbspeexppc.a |
90 | endif | 90 | endif |
91 | 91 | ||
92 | librbspeex-universal: librbspeexi386.a librbspeexppc.a | 92 | librbspeex-universal: librbspeexi386.a librbspeexppc.a |
@@ -98,7 +98,7 @@ clean: | |||
98 | rm -f $(OBJS) librbspeex* ../rbspeexenc ../rbspeexdec dep-speex | 98 | rm -f $(OBJS) librbspeex* ../rbspeexenc ../rbspeexdec dep-speex |
99 | rm -rf build* | 99 | rm -rf build* |
100 | 100 | ||
101 | build$(ARCH): | 101 | build$(RBARCH): |
102 | @echo MKDIR build$(ARCH) | 102 | @echo MKDIR build$(RBARCH) |
103 | $(SILENT)mkdir build$(ARCH) | 103 | $(SILENT)mkdir build$(RBARCH) |
104 | 104 | ||