summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--rbutil/mkamsboot/Makefile6
-rw-r--r--rbutil/mktccboot/Makefile6
-rw-r--r--tools/ucl/src/Makefile6
3 files changed, 9 insertions, 9 deletions
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile
index d3517d1579..37163600fc 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 4d6e857952..14c184321c 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 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