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/generic/Makefile    |  6 +++---
 libc/string/generic/Makefile.in | 29 -----------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 libc/string/generic/Makefile.in

(limited to 'libc/string/generic')

diff --git a/libc/string/generic/Makefile b/libc/string/generic/Makefile
index 4a8f4a072..0a95346fd 100644
--- a/libc/string/generic/Makefile
+++ b/libc/string/generic/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.in
+include ../Makefile.in
 include $(top_srcdir)Makerules
diff --git a/libc/string/generic/Makefile.in b/libc/string/generic/Makefile.in
deleted file mode 100644
index 82910172a..000000000
--- a/libc/string/generic/Makefile.in
+++ /dev/null
@@ -1,29 +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_GENERIC_DIR:=$(top_srcdir)libc/string/generic
-STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic
-
-STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c)
-
-ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
-ifneq ($(strip $(STRING_ARCH_OBJS)),)
-STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
-endif
-endif
-
-STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
-
-libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS)
-libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os)
-
-libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC)
-
-objclean-y+=string_generic_objclean
-
-string_generic_objclean:
-	$(RM) $(STRING_GENERIC_OUT)/*.{o,os}
-- 
cgit v1.2.3