From bbe0a336ebb748f5ab398f015d92c8e3ba617236 Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Sat, 28 Nov 2009 22:39:00 +0000
Subject: [PATCH] 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
---
 rbutil/mkamsboot/Makefile | 6 +++---
 rbutil/mktccboot/Makefile | 6 +++---
 tools/ucl/src/Makefile    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile
index d3517d157..37163600f 100644
--- a/rbutil/mkamsboot/Makefile
+++ b/rbutil/mkamsboot/Makefile
@@ -68,14 +68,14 @@ $(OUTPUT): $(OBJS) $(EXTRADEPS)
 
 # some trickery to build ppc and i386 from a single call
 ifeq ($(RBARCH),)
-libmkamsbooti386.a:
+$(TARGET_DIR)libmkamsbooti386.a:
 	make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmkamsbooti386.a
 
-libmkamsbootppc.a:
+$(TARGET_DIR)libmkamsbootppc.a:
 	make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmkamsbootppc.a
 endif    
     
-libmkamsboot-universal: libmkamsbooti386.a libmkamsbootppc.a
+libmkamsboot-universal: $(TARGET_DIR)libmkamsbooti386.a $(TARGET_DIR)libmkamsbootppc.a
 	@echo lipo $(TARGET_DIR)libmkamsboot.a
 	$(SILENT) rm -f $(TARGET_DIR)libmkamsboot.a
 	lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a
diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile
index 4d6e85795..14c184321 100644
--- a/rbutil/mktccboot/Makefile
+++ b/rbutil/mktccboot/Makefile
@@ -72,14 +72,14 @@ $(OUTPUT): $(OBJS) $(EXTRADEPS)
 
 # some trickery to build ppc and i386 from a single call
 ifeq ($(RBARCH),)
-libmktccbooti386.a:
+$(TARGET_DIR)libmktccbooti386.a:
 	make RBARCH=i386 TARGET_DIR=$(TARGET_DIR) libmktccbooti386.a
 
-libmktccbootppc.a:
+$(TARGET_DIR)libmktccbootppc.a:
 	make RBARCH=ppc TARGET_DIR=$(TARGET_DIR) libmktccbootppc.a
 endif    
     
-libmktccboot-universal: libmktccbooti386.a libmktccbootppc.a
+libmktccboot-universal: $(TARGET_DIR)libmktccbooti386.a $(TARGET_DIR)libmktccbootppc.a
 	@echo lipo $(TARGET_DIR)libmktccboot.a
 	$(SILENT) rm -f $(TARGET_DIR)libmktccboot.a
 	lipo -create $(TARGET_DIR)libmktccbootppc.a $(TARGET_DIR)libmktccbooti386.a -output $(TARGET_DIR)libmktccboot.a
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile
index 147959aaa..14ca1f35e 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    
-- 
2.11.4.GIT