From 3a0c5648e3c0a691e285a4ae1003cb6e06a19df1 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 24 Jan 2001 23:33:40 +0000
Subject: stage1: add pcmcia

---
 mdk-stage1/Makefile | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'mdk-stage1/Makefile')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 2aeee3990..efb7440a9 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -118,23 +118,16 @@ endif
 BINS = init stage1-cdrom stage1-disk stage1-network stage1-full
 
 
-#ifeq (i386, $(ARCH))
-#BINS += stage1-all stage1-cdrom stage1-network stage1-hd stage1-pcmcia
-#endif
-#
-#ifeq (ia64, $(ARCH))
-#BINS += stage1-all
-#endif
-#
-#ifeq (alpha, $(ARCH))
-#BINS += stage1-all
-#endif
-#
-#ifeq (sparc, $(ARCH))
-#BINS += stage1-all
-#endif
-
 DIRS = dietlibc mar insmod-busybox pci-resource
+ifeq (i386,$(ARCH))
+DIRS += pcmcia
+endif
+
+
+ifeq (i386,$(ARCH))
+PCMCIA_LIB = pcmcia/libpcmcia.a
+PCMCIA_DEFS = -DENABLE_PCMCIA
+endif
 
 
 all: dirs $(BINS)
@@ -160,11 +153,7 @@ stage1-network: $(STAGE1OBJS-NETWORK) $(GLIBC_STAGE1_OWN_LIBS) $(STAGE1_OTHER_LI
 	$(CC) $(GLIBC_LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
-stage1-pcmcia: $(STAGE1OBJS-PCMCIA) $(GLIBC_STAGE1_OWN_LIBS) $(STAGE1_OTHER_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK)
-	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
-	$(STRIPCMD) $@
-
-stage1-full: $(STAGE1OBJS) $(GLIBC_STAGE1_OWN_LIBS) $(STAGE1_OTHER_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK)
+stage1-full: $(STAGE1OBJS) $(GLIBC_STAGE1_OWN_LIBS) $(STAGE1_OTHER_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB)
 	$(CC) $(GLIBC_LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
@@ -179,7 +168,7 @@ $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c .depend
 	$(COMPILE) $(GLIBC_INCLUDES) $(NETWORK_DEFS) -c $< -o $@
 
 .c.o: .depend
-	$(COMPILE) $(GLIBC_INCLUDES) -c $<
+	$(COMPILE) $(GLIBC_INCLUDES) $(PCMCIA_DEFS) -c $<
 
 
 clean: 
-- 
cgit v1.2.1