From 130697527bfd32f3a6a6e4dfcc1e80c0cdfa0b37 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 25 Jan 2005 03:17:00 +0000 Subject: merge parallel build support --- libc/string/Makefile | 9 ++++----- libc/string/arm/Makefile | 10 +++++----- libc/string/frv/Makefile | 9 ++++----- libc/string/generic/Makefile | 10 ++++------ libc/string/i386/Makefile | 9 ++++----- libc/string/mips/Makefile | 10 +++++----- libc/string/powerpc/Makefile | 9 ++++----- libc/string/sh64/Makefile | 10 +++++----- 8 files changed, 35 insertions(+), 41 deletions(-) (limited to 'libc/string') diff --git a/libc/string/Makefile b/libc/string/Makefile index 02c86d6aa..111bf2fdb 100644 --- a/libc/string/Makefile +++ b/libc/string/Makefile @@ -67,12 +67,12 @@ ifeq ($(UCLIBC_HAS_WCHAR),y) OBJS += $(MOBJW) $(MOBJWx) endif -all: $(LIBC) subdirs +OBJ_LIST=../obj.string -$(LIBC): ar-target +all: $(OBJ_LIST) subdirs -ar-target: $(OBJS) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/%, $(OBJS)) > $(OBJ_LIST) $(MOBJ): $(MSRC) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o @@ -107,4 +107,3 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean .PHONY: dummy - diff --git a/libc/string/arm/Makefile b/libc/string/arm/Makefile index 7a4e18454..a874eb96d 100644 --- a/libc/string/arm/Makefile +++ b/libc/string/arm/Makefile @@ -22,13 +22,14 @@ include $(TOPDIR)Rules.mak SSRC= _memcpy.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \ strcmp.S strlen.S strncmp.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) +OBJS=$(SOBJS) -all: $(SOBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(SOBJS) - $(AR) $(ARFLAGS) $(LIBC) $(SOBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(SOBJS): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ @@ -36,4 +37,3 @@ $(SOBJS): %.o : %.S clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/frv/Makefile b/libc/string/frv/Makefile index b9cea059a..36682c94c 100644 --- a/libc/string/frv/Makefile +++ b/libc/string/frv/Makefile @@ -23,12 +23,12 @@ SSRC=memcpy.S memset.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) OBJS=$(SOBJS) -all: $(OBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(OBJS) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(SOBJS): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ @@ -36,4 +36,3 @@ $(SOBJS): %.o : %.S clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/generic/Makefile b/libc/string/generic/Makefile index 3f9af72a3..fac678a59 100644 --- a/libc/string/generic/Makefile +++ b/libc/string/generic/Makefile @@ -25,15 +25,14 @@ CSRC= memchr.c memcmp.c memcpy.c memmem.c memmove.c mempcpy.c memrchr.c \ strrchr.c strsep.c strspn.c strstr.c strtok_r.c COBJS=$(patsubst %.c,%.o, $(CSRC)) - OBJS=$(COBJS) -all: $(OBJS) $(LIBC) +OBJ_LIST=../../obj.string.generic -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(OBJS) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/generic/%, $(OBJS)) > $(OBJ_LIST) # $(MOBJ): $(MSRC) # $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o @@ -45,4 +44,3 @@ $(COBJS): %.o : %.c clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/i386/Makefile b/libc/string/i386/Makefile index 3042e6e98..d2baa7dd8 100644 --- a/libc/string/i386/Makefile +++ b/libc/string/i386/Makefile @@ -25,12 +25,12 @@ MOBJ= strcpy.o strncpy.o strcat.o strncat.o strcmp.o \ memcpy.o memmove.o memchr.o memset.o OBJS=$(MOBJ) -all: $(OBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(OBJS) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(MOBJ): $(MSRC) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o @@ -42,4 +42,3 @@ $(COBJS): %.o : %.c clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/mips/Makefile b/libc/string/mips/Makefile index 805024929..a6d7d4a4b 100644 --- a/libc/string/mips/Makefile +++ b/libc/string/mips/Makefile @@ -21,13 +21,14 @@ include $(TOPDIR)Rules.mak SSRC= memcpy.S memset.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) +OBJS=$(SOBJS) -all: $(SOBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(SOBJS) - $(AR) $(ARFLAGS) $(LIBC) $(SOBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(SOBJS): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ @@ -35,4 +36,3 @@ $(SOBJS): %.o : %.S clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/powerpc/Makefile b/libc/string/powerpc/Makefile index d99798694..c1b0ba184 100644 --- a/libc/string/powerpc/Makefile +++ b/libc/string/powerpc/Makefile @@ -23,12 +23,12 @@ MSRC= string.c MOBJ= memcpy.o memmove.o memset.o bzero.o OBJS=$(MOBJ) -all: $(OBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(OBJS) - $(AR) $(ARFLAGS) $(LIBC) $(OBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(MOBJ): $(MSRC) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o @@ -40,4 +40,3 @@ $(COBJS): %.o : %.c clean: $(RM) *.[oa] *~ core - diff --git a/libc/string/sh64/Makefile b/libc/string/sh64/Makefile index fcd988f58..0a7ee0ba2 100644 --- a/libc/string/sh64/Makefile +++ b/libc/string/sh64/Makefile @@ -21,13 +21,14 @@ include $(TOPDIR)Rules.mak SSRC= memcpy.S memset.S strcpy.S strlen.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) +OBJS=$(SOBJS) -all: $(SOBJS) $(LIBC) +OBJ_LIST=../../obj.string.$(TARGET_ARCH) -$(LIBC): ar-target +all: $(OBJ_LIST) -ar-target: $(SOBJS) - $(AR) $(ARFLAGS) $(LIBC) $(SOBJS) +$(OBJ_LIST): $(OBJS) + echo $(patsubst %, string/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(SOBJS): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ @@ -35,4 +36,3 @@ $(SOBJS): %.o : %.S clean: $(RM) *.[oa] *~ core - -- cgit v1.2.3