From 9c9ea56612e9dd04d455c87c806f8e95744945d9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 20 Jan 2006 02:11:06 +0000
Subject: move some generic arch rules up a level to remove duplication

---
 libm/Makefile.in           | 5 ++++-
 libm/powerpc/Makefile.arch | 8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libm/Makefile.in b/libm/Makefile.in
index fa57e3374..60d880dba 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -29,6 +29,9 @@ LIBS-libm.so := $(LIBS)
 
 libm_FULL_NAME := libm-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
+libm_ARCH_DIR:=$(top_srcdir)libm/$(TARGET_ARCH)
+libm_ARCH_OUT:=$(top_builddir)libm/$(TARGET_ARCH)
+
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 -include $(top_srcdir)libm/$(TARGET_ARCH)/Makefile.arch
@@ -159,4 +162,4 @@ $(libm_MOBJ:.o=.os): $(libm_MSRC)
 	$(compile.m)
 
 libm_clean:
-	$(RM) $(libm_OUT)/*.{o,os,oS,a}
+	$(RM) $(libm_OUT)/*.{o,os,oS,a} $(libm_ARCH_OUT)/*.{o,os,oS}
diff --git a/libm/powerpc/Makefile.arch b/libm/powerpc/Makefile.arch
index 6615e901c..7c7600f80 100644
--- a/libm/powerpc/Makefile.arch
+++ b/libm/powerpc/Makefile.arch
@@ -5,9 +5,6 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-libm_ARCH_DIR:=$(top_srcdir)libm/powerpc
-libm_ARCH_OUT:=$(top_builddir)libm/powerpc
-
 libm_ARCH_SRC:=$(wildcard $(libm_ARCH_DIR)/*.c)
 libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_DIR)/%.c,$(libm_ARCH_OUT)/%.o,$(libm_ARCH_SRC))
 
@@ -19,8 +16,3 @@ else
 libm-a-y+=$(libm_ARCH_OBJS)
 endif
 libm-so-y+=$(libm_ARCH_OBJS:.o=.os)
-
-objclean-y+=libm_arch_objclean
-
-libm_arch_objclean:
-	$(RM) $(libm_ARCH_OUT)/*.{o,os}
-- 
cgit v1.2.3