diff options
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 2 | ||||
| -rw-r--r-- | tools/rbspeex/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index c6f25613ba..f127d20bb2 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -22,7 +22,7 @@ mac { 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 ARCH=ppc universal +rbspeex4.commands = @$(MAKE) -C ../../tools/rbspeex universal rbspeex2.depends = rbspeex1 rbspeex3.depends = rbspeex2 rbspeex4.depends = rbspeex3 diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 5ed8d67425..b619ce73fe 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile @@ -58,7 +58,7 @@ $(DEPFILE): $(SOURCES) done > $(DEPFILE); \ echo "oo" > /dev/null ) -librbspeex$(ARCH_CMD).a: $(OBJS) $(DEPFILE) rbspeex.o +librbspeex$(ARCH).a: $(OBJS) $(DEPFILE) rbspeex.o @echo AR librbspeex.a $(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1 @@ -76,7 +76,7 @@ librbspeex$(ARCH_CMD).a: $(OBJS) $(DEPFILE) rbspeex.o universal: librbspeexppc.a librbspeexi386.a @echo lipo libusb.a - @(SILENT) lipo -create librbspeexppc.a librbspeexi386.a -output 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 |