From 130697527bfd32f3a6a6e4dfcc1e80c0cdfa0b37 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 25 Jan 2005 03:17:00 +0000
Subject: merge parallel build support

---
 libc/stdlib/Makefile                 | 10 ++++------
 libc/stdlib/malloc-simple/Makefile   | 12 +++++-------
 libc/stdlib/malloc-standard/Makefile |  9 ++++-----
 libc/stdlib/malloc/Makefile          |  8 ++++----
 4 files changed, 17 insertions(+), 22 deletions(-)

(limited to 'libc/stdlib')

diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 02dd8887e..5a3ffe631 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -94,12 +94,12 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(MOBJ) $(MOBJx) $(MOBJ1) $(MOBJ1x) $(MOBJ2) $(COBJS)
 
-all: $(OBJS) $(LIBC)
+OBJ_LIST=../obj.stdlib
 
-$(LIBC): ar-target subdirs
+all: $(OBJ_LIST) subdirs
 
-ar-target: $(OBJS)
-	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
+$(OBJ_LIST): $(OBJS)
+	echo $(patsubst %, stdlib/%, $(OBJS)) > $(OBJ_LIST)
 
 $(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
@@ -140,5 +140,3 @@ clean: subdirs_clean
 	$(RM) *.[oa] *~ core
 
 .PHONY: dummy
-
-
diff --git a/libc/stdlib/malloc-simple/Makefile b/libc/stdlib/malloc-simple/Makefile
index 1da7a672c..161aece1a 100644
--- a/libc/stdlib/malloc-simple/Makefile
+++ b/libc/stdlib/malloc-simple/Makefile
@@ -27,18 +27,16 @@ MSRC=alloc.c
 MOBJ=malloc.o realloc.o free.o calloc.o memalign.o
 OBJS=$(MOBJ)
 
+OBJ_LIST=../../obj.stdlib.malloc-simple
 
-all: $(OBJS) $(LIBC)
+all: $(OBJ_LIST)
 
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
-	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
+$(OBJ_LIST): $(OBJS)
+	echo $(patsubst %, stdlib/malloc-simple/%, $(OBJS)) > $(OBJ_LIST)
 
 $(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	rm -f *.[oa] *~ core
-
+	$(RM) *.[oa] *~ core
diff --git a/libc/stdlib/malloc-standard/Makefile b/libc/stdlib/malloc-standard/Makefile
index 2b87c5de2..0af06b3ff 100644
--- a/libc/stdlib/malloc-standard/Makefile
+++ b/libc/stdlib/malloc-standard/Makefile
@@ -35,12 +35,12 @@ CSRC=malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
-all: $(OBJS) $(LIBC)
+OBJ_LIST=../../obj.stdlib.malloc-standard
 
-$(LIBC): ar-target
+all: $(OBJ_LIST)
 
-ar-target: $(OBJS)
-	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
+$(OBJ_LIST): $(OBJS)
+	echo $(patsubst %, stdlib/malloc-standard/%, $(OBJS)) > $(OBJ_LIST)
 
 $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -48,4 +48,3 @@ $(COBJS): %.o : %.c
 
 clean:
 	$(RM) *.[oa] *~ core
-
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index ce789f8e8..e4a6f3a43 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -39,12 +39,12 @@ endif
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
-all: $(OBJS) $(LIBC)
+OBJ_LIST=../../obj.stdlib.malloc
 
-$(LIBC): ar-target
+all: $(OBJ_LIST)
 
-ar-target: $(OBJS)
-	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
+$(OBJ_LIST): $(OBJS)
+	echo $(patsubst %, stdlib/malloc/%, $(OBJS)) > $(OBJ_LIST)
 
 malloc.o free.o realloc.o memalign.o: malloc.h
 $(COBJS): heap.h
-- 
cgit v1.2.3