From c3a27f5095a50bef9e56f19eeed1176319e189e2 Mon Sep 17 00:00:00 2001
From: Erik Andersen <andersen@codepoet.org>
Date: Sun, 14 May 2000 06:07:31 +0000
Subject: Some makefile updates to make it behave a bit better/consistently. 
 -Erik

---
 libc/stdlib/Makefile        | 11 +++--------
 libc/stdlib/malloc/Makefile | 10 +++-------
 2 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'libc/stdlib')

diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index c45cd2840..61a82a2d6 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -2,13 +2,10 @@
 # This file is part of the Linux-8086 C library and is distributed
 # under the GNU Library General Public License.
 
-LIBC=../libc.a
-
-CC=$(CROSS)gcc
-AR=$(CROSS)ar
-RANLIB=$(CROSS)ranlib
+TOPDIR=../
+include $(TOPDIR)Rules.make
 
-CCFLAGS= -O2 $(CPUFLAGS) -fno-builtin -I../include
+LIBC=../libc.a
 
 MSRC=aliases.c
 MOBJ=abs.o remove.o creat.o bcopy.o bzero.o
@@ -33,8 +30,6 @@ OBJ=$(MOBJ) $(EOBJ) $(GOBJ) $(UOBJ)
 #OBJ+=strtod.o
 #endif
 
-CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
-
 all: $(LIBC)
 	@$(RM) $(OBJ)
 
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index 26cfb6930..368adb797 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -2,14 +2,10 @@
 # This file is part of the Linux-8086 C library and is distributed
 # under the GNU Library General Public License.
 
-LIBC=../libc.a
-
-CC=$(CROSS)gcc
-AR=$(CROSS)ar
-RANLIB=$(CROSS)ranlib
-
-CCFLAGS= -O2 $(CPUFLAGS) -I../include
+TOPDIR=../
+include Rules.make
 
+LIBC=../libc.a
 
 MSRC=alloc.c
 MOBJ=malloc.o free.o calloc.o malloc_dbg.o free_dbg.o calloc_dbg.o
-- 
cgit v1.2.3