Extend rbspeex Makefile to allow easier building a universal binary needed for rbutil.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18103 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 40 insertions, 29 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index e9dd5ab10d..f0c95ac5a0 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -15,21 +15,12 @@ RCC_DIR = build/rcc
 # add a custom rule for pre-building librbspeex
 !mac {
 rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a
-QMAKE_EXTRA_TARGETS += rbspeex
-PRE_TARGETDEPS += rbspeex
 }
 mac {
-rbspeex0.commands = @$(MAKE) -C ../../tools/rbspeex clean
-rbspeex1.commands = @$(MAKE) -C ../../tools/rbspeex ARCH=ppc librbspeexppc.a
-rbspeex2.commands = @$(MAKE) -C ../../tools/rbspeex clean
-rbspeex3.commands = @$(MAKE) -C ../../tools/rbspeex ARCH=i386 librbspeexi386.a
-rbspeex4.commands = @$(MAKE) -C ../../tools/rbspeex universal
-rbspeex2.depends = rbspeex1
-rbspeex3.depends = rbspeex2
-rbspeex4.depends = rbspeex3
-QMAKE_EXTRA_TARGETS += rbspeex1 rbspeex2 rbspeex3 rbspeex4
-PRE_TARGETDEPS += rbspeex1 rbspeex2 rbspeex4 rbspeex4
+rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex-universal
 }
+QMAKE_EXTRA_TARGETS += rbspeex
+PRE_TARGETDEPS += rbspeex
 
 # rule for creating ctags file
 tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES) 
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 2511393833..383acc986a 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -28,28 +28,29 @@ CC = gcc
 endif
 
 ifdef ARCH
-ARCH_CMD = -arch $(ARCH)
+CFLAGS += -arch $(ARCH)
 endif
 
 
 # This sets up 'SRC' based on the files mentioned in SOURCES
-SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#")
+SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$")
 
+OUT = build$(ARCH)
 SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c
-OBJS := $(SRC:%.c=%.o)
-DEPFILE = dep-speex
+OBJS = $(addprefix $(OUT)/,$(SRC:%.c=%.o))
+DEPFILE = $(OUT)/dep-speex
 DIRS = 
 
 .PHONY : all
 
 all: ../rbspeexenc ../rbspeexdec
 
-$(DEPFILE): $(SOURCES)
+$(DEPFILE): $(SOURCES) $(OUT)
         $(SILENT)rm -f $(DEPFILE)
         $(SILENT)(for each in $(SOURCES) x; do \
             if test "x" != "$$each"; then \
                 obj=`echo $$each | sed -e 's/\.[cS]/.o/' | sed -e 's/^.*\///' `; \
-                $(CC) -MG -MM -MT "$$obj" $(CFLAGS) $$each 2>/dev/null; \
+                $(CC) -MG -MM -MT "$(OUT)/$$obj" $(CFLAGS) $$each 2>/dev/null; \
             fi; \
             if test -n "$$del"; then \
                 rm $$del; \
@@ -58,27 +59,46 @@ $(DEPFILE): $(SOURCES)
         done > $(DEPFILE); \
         echo "oo" > /dev/null )
 
-librbspeex$(ARCH).a: $(OBJS) $(DEPFILE) rbspeex.o 
-        @echo AR librbspeex.a
+-include $(DEPFILE)
+
+$(OUT)/librbspeex.a: $(OBJS) $(DEPFILE) $(OUT)/rbspeex.o 
+        @echo AR $(OUT)/librbspeex$(ARCH).a
         $(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1
 
-../rbspeexenc: $(OBJS) rbspeexenc.o librbspeex.a 
+librbspeex$(ARCH).a: $(OUT)/librbspeex.a
+        $(SILENT)cp $(OUT)/librbspeex.a librbspeex$(ARCH).a
+
+../rbspeexenc: $(OBJS) $(OUT)/rbspeexenc.o librbspeex$(ARCH).a
         @echo Linking ../rbspeexenc
-        $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc rbspeexenc.o librbspeex.a -lm
+        $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexenc $(OUT)/rbspeexenc.o librbspeex$(ARCH).a -lm
 
-../rbspeexdec: $(OBJS) librbspeex.a rbspeexdec.o 
+../rbspeexdec: $(OBJS) librbspeex$(ARCH).a $(OUT)/rbspeexdec.o 
         @echo Linking ../rbspeexdec
-        $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec rbspeexdec.o librbspeex.a -lm 
+        $(SILENT)$(CC) $(CFLAGS) -o ../rbspeexdec $(OUT)/rbspeexdec.o librbspeex$(ARCH).a -lm 
 
 %.o:
         @echo CC $<
-        $(SILENT)$(CC) $(CFLAGS) -c $< -o $@ $(ARCH_CMD)
+        $(SILENT)$(CC) $(CFLAGS) -c $< -o $@
+
+# some trickery to build ppc and i386 from a single call
+ifeq ($(ARCH),)
+librbspeexi386.a:
+        make ARCH=i386 librbspeexi386.a
 
-universal: librbspeexppc.a librbspeexi386.a
-        @echo lipo libusb.a
+librbspeexppc.a:
+        make ARCH=ppc librbspeexppc.a
+endif
+
+librbspeex-universal: librbspeexi386.a librbspeexppc.a
+        @echo lipo librbspeex.a
+        $(SILENT) rm -f librbspeex.a
         lipo -create librbspeexppc.a librbspeexi386.a -output librbspeex.a
 
 clean:
-        rm -f $(OBJS) rbspeex.o libspeex.a librbspeex.a rbspeexenc.o ../rbspeexenc dep-speex
+        rm -f $(OBJS) librbspeex* ../rbspeexenc ../rbspeexdec dep-speex
+        rm -rf build*
+
+build$(ARCH):
+        @echo MKDIR build$(ARCH)
+        $(SILENT)mkdir build$(ARCH)
 
--include $(DEPFILE)