From 358043ffb9380926813eb8200f0a45140acdb77a Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 28 Oct 2005 09:57:22 +0000 Subject: Renamed arch specific Makefile.in to Makefile.arch, else if TARGET_ARCH does not exist, we reinclude the including Makefile. Moved arch/common fpu_control.h link creation into main Makefile.in. Updated the link creation script to remove all the other Makefiles --- libpthread/linuxthreads/Makefile.in | 2 +- libpthread/linuxthreads/sysdeps/sh64/Makefile.arch | 26 ++++++++++++++++++++++ libpthread/linuxthreads/sysdeps/sh64/Makefile.in | 26 ---------------------- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 libpthread/linuxthreads/sysdeps/sh64/Makefile.arch delete mode 100644 libpthread/linuxthreads/sysdeps/sh64/Makefile.in (limited to 'libpthread') diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index b6351725f..88692489f 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -30,7 +30,7 @@ libpthread_DIR:=$(top_srcdir)libpthread/linuxthreads libpthread_OUT:=$(top_builddir)libpthread/linuxthreads ARCH_CFLAGS:=$(CFLAGS) --include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.in +-include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch CFLAGS:=$(ARCH_CFLAGS) libpthread_SRC:=$(wildcard $(libpthread_DIR)/*.c) diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch new file mode 100644 index 000000000..38cd12db6 --- /dev/null +++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch @@ -0,0 +1,26 @@ +# Makefile for uClibc +# +# Copyright (C) 2003 Paul Mundt +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +# We need to build as SHcompact for tas.. +ARCH_CFLAGS:=$(subst 32media,compact,$(ARCH_CFLAGS)) + +libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads/sysdeps/sh64 +libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads/sysdeps/sh64 + +libpthread_ARCH_SRC:=$(wildcard $(libpthread_ARCH_DIR)/*.c) +libpthread_ARCH_OBJ:=$(patsubst $(libpthread_ARCH_DIR)/%.c,$(libpthread_ARCH_OUT)/%.o,$(libpthread_ARCH_SRC)) + +libpthread-a-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ) +libpthread-so-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ:.o=.os) + +libpthread-multi-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_SRC) + +objclean-y+=libpthread_arch_objclean + +libpthread_arch_objclean: + $(RM) $(libpthread_ARCH_OUT)/*.{o,os} diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in b/libpthread/linuxthreads/sysdeps/sh64/Makefile.in deleted file mode 100644 index 38cd12db6..000000000 --- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2003 Paul Mundt -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -# We need to build as SHcompact for tas.. -ARCH_CFLAGS:=$(subst 32media,compact,$(ARCH_CFLAGS)) - -libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads/sysdeps/sh64 -libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads/sysdeps/sh64 - -libpthread_ARCH_SRC:=$(wildcard $(libpthread_ARCH_DIR)/*.c) -libpthread_ARCH_OBJ:=$(patsubst $(libpthread_ARCH_DIR)/%.c,$(libpthread_ARCH_OUT)/%.o,$(libpthread_ARCH_SRC)) - -libpthread-a-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ) -libpthread-so-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_OBJ:.o=.os) - -libpthread-multi-$(UCLIBC_HAS_THREADS)+=$(libpthread_ARCH_SRC) - -objclean-y+=libpthread_arch_objclean - -libpthread_arch_objclean: - $(RM) $(libpthread_ARCH_OUT)/*.{o,os} -- cgit v1.2.3