summaryrefslogtreecommitdiffstats
path: root/tools/ucl/src
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-28 22:39:00 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-28 22:39:00 +0000
commitcca6f747f807105fd7a8e4834ebd73a5a996d8d2 (patch)
tree0a8936f678da78538b3a163ed11a778b8414d459 /tools/ucl/src
parentc3ca746de4ac62b3fba6f9b6656caf927a63c936 (diff)
downloadrockbox-cca6f747f807105fd7a8e4834ebd73a5a996d8d2.tar.gz
rockbox-cca6f747f807105fd7a8e4834ebd73a5a996d8d2.tar.bz2
rockbox-cca6f747f807105fd7a8e4834ebd73a5a996d8d2.zip
Handle TARGET_DIR in universal library building.
Building universal libraries needs to take TARGET_DIR into account as when set the individual libraries are placed into the build output folder and didn't got found anymore. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23778 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/ucl/src')
-rw-r--r--tools/ucl/src/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile
index 147959aaa1..14ca1f35eb 100644
--- a/tools/ucl/src/Makefile
+++ b/tools/ucl/src/Makefile
@@ -40,14 +40,14 @@ $(OUT)/%.o: %.c
# some trickery to build ppc and i386 from a single call
ifeq ($(RBARCH),)
-libucli386.a:
+$(TARGET_DIR)libucli386.a:
make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libucli386.a
-libuclppc.a:
+$(TARGET_DIR)libuclppc.a:
make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libuclppc.a
endif
-libucl-universal: libucli386.a libuclppc.a
+libucl-universal: $(TARGET_DIR)libucli386.a $(TARGET_DIR)libuclppc.a
@echo lipo $(TARGET_DIR)libucl.a
$(SILENT) rm -f $(TARGET_DIR)libucl.a
lipo -create $(TARGET_DIR)libuclppc.a $(TARGET_DIR)libucli386.a -output $(TARGET_DIR)libucl.a