From 7285da14ed731d5bdb310bd8f4018c07c8a83e5c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 3 Feb 2006 23:29:34 +0000
Subject: unify duplicated code cause i get tired of updating this stuff

---
 libc/string/i386/Makefile      |  6 +++---
 libc/string/i386/Makefile.arch | 24 ------------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 libc/string/i386/Makefile.arch

(limited to 'libc/string/i386')

diff --git a/libc/string/i386/Makefile b/libc/string/i386/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/i386/Makefile
+++ b/libc/string/i386/Makefile
@@ -5,9 +5,9 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-top_srcdir=../../../
-top_builddir=../../../
+top_srcdir:=../../../
+top_builddir:=../../../
 all: objs
 include $(top_builddir)Rules.mak
-include Makefile.arch
+include ../Makefile.in
 include $(top_srcdir)Makerules
diff --git a/libc/string/i386/Makefile.arch b/libc/string/i386/Makefile.arch
deleted file mode 100644
index 27a29dd16..000000000
--- a/libc/string/i386/Makefile.arch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/i386
-STRING_ARCH_OUT:=$(top_builddir)libc/string/i386
-
-STRING_ARCH_CSRC:=$(wildcard $(STRING_ARCH_DIR)/*.c)
-STRING_ARCH_COBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_CSRC))
-
-STRING_ARCH_OBJS:=$(STRING_ARCH_COBJ)
-
-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_CSRC)
-
-objclean-y+=string_arch_objclean
-
-string_arch_objclean:
-	$(RM) $(STRING_ARCH_OUT)/*.{o,os}
-- 
cgit v1.2.3