From 31d44a623579fbca300f20bc751c7278c4375980 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Thu, 22 Feb 2001 17:21:43 +0000 Subject: use modutils for non Intel arch's --- mdk-stage1/Makefile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'mdk-stage1/Makefile') diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index c230d4b39..530c8b9b2 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -26,9 +26,6 @@ top_dir = . include $(top_dir)/Makefile.common -ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) - CFLAGS = -Os -pipe -Wall -Werror -fomit-frame-pointer DEFS = -DVERSION=\"$(VERSION)\" @@ -73,9 +70,14 @@ MEDIAS_FRONTEND_LINK = $(FRONTEND_LINK) endif endif +ifeq (i386, $(ARCH)) +INSMOD = insmod-busybox +else +INSMOD = insmod-modutils +endif -GLIBC_STAGE1_OWN_LIBS = insmod-busybox/libinsmod.a mar/libmar.a bzlib/libbzlib.a -DIETLIBC_STAGE1_OWN_LIBS = insmod-busybox/libinsmod-DIET.a mar/libmar-DIET.a bzlib/libbzlib-DIET.a +GLIBC_STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a +DIETLIBC_STAGE1_OWN_LIBS = $(INSMOD)/libinsmod-DIET.a mar/libmar-DIET.a bzlib/libbzlib-DIET.a STAGE1_OWN_LIBS = $($(L)_STAGE1_OWN_LIBS) @@ -116,10 +118,14 @@ INIT_LIBC = $(DIETLIBC_LIBC) endif -BINS = init stage1-cdrom stage1-disk stage1-network stage1-full +BINS = init stage1-full + +ifeq (i386, $(ARCH)) +BINS += stage1-cdrom stage1-disk stage1-network +endif -DIRS = dietlibc mar insmod-busybox pci-resource bzlib +DIRS = dietlibc mar pci-resource bzlib $(INSMOD) ifeq (i386,$(ARCH)) DIRS += pcmcia endif -- cgit v1.2.1