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 --- libc/string/x86_64/Makefile.arch | 27 +++++++++++++++++++++++++++ libc/string/x86_64/Makefile.in | 28 ---------------------------- 2 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 libc/string/x86_64/Makefile.arch delete mode 100644 libc/string/x86_64/Makefile.in (limited to 'libc/string/x86_64') diff --git a/libc/string/x86_64/Makefile.arch b/libc/string/x86_64/Makefile.arch new file mode 100644 index 000000000..914eab55c --- /dev/null +++ b/libc/string/x86_64/Makefile.arch @@ -0,0 +1,27 @@ +# Makefile for uClibc +# +# Copyright (C) 2000-2005 Erik Andersen +# +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# + +STRING_ARCH_DIR:=$(top_srcdir)libc/string/x86_64 +STRING_ARCH_OUT:=$(top_builddir)libc/string/x86_64 + +STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) +STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) + +STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) +STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) + +STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) + +libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) +libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) + +libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) + +objclean-y+=string_x86_64_objclean + +string_x86_64_objclean: + $(RM) $(STRING_ARCH_OUT)/*.{o,os} diff --git a/libc/string/x86_64/Makefile.in b/libc/string/x86_64/Makefile.in deleted file mode 100644 index 83cc470c9..000000000 --- a/libc/string/x86_64/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -# Makefile for uClibc -# -# Copyright (C) 2000-2005 Erik Andersen -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -STRING_ARCH_DIR:=$(top_srcdir)libc/string/x86_64 -STRING_ARCH_OUT:=$(top_builddir)libc/string/x86_64 - -STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c) -STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC)) - -STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S) -STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC)) - -STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ) - -libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) -libc-a-pic-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) - -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) $(STRING_ARCH_SSRC) - -objclean-y+=string_x86_64_objclean - -string_x86_64_objclean: - $(RM) $(STRING_ARCH_OUT)/*.{o,os} -- cgit v1.2.3