From a08cfceb71abf287fc2856fab1bbe6f4e5e7ba5b Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Tue, 3 Jul 2001 20:08:18 +0000
Subject: add support for install from USB Network Adapters

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

(limited to 'mdk-stage1/Makefile')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index a27d829a9..52a7fe792 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -43,7 +43,7 @@ top_dir = .
 include $(top_dir)/Makefile.common
 
 
-DEFS = -DVERSION=\"$(VERSION)\" #-DSPAWN_SHELL
+DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL
 
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
@@ -122,6 +122,9 @@ STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC))
 NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK
 
 
+STAGE1OBJS-USBNET = $(subst .c,-USBNET.o,$(STAGE1SRC) $(NETWORKSRC))
+
+
 STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC))
 
 
@@ -141,13 +144,13 @@ endif
 BINS = init stage1-full
 
 ifeq (i386, $(ARCH))
-BINS += stage1-cdrom stage1-disk stage1-network
+BINS += stage1-cdrom stage1-disk stage1-network stage1-usbnet
 endif
 
 ifneq (ia64, $(ARCH))
 DIRS = dietlibc
 endif
-DIRS += mar pci-resource bzlib $(INSMOD) slang newt ppp/pppd rp-pppoe/src
+DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt ppp/pppd rp-pppoe/src
 ifeq (i386,$(ARCH))
 DIRS += pcmcia
 endif
@@ -161,6 +164,9 @@ PCMCIA_DEFS = -DENABLE_PCMCIA
 endif
 
 
+USBNET_DEFS_GEN = -DENABLE_USB -DENABLE_USBNET
+USBNET_DEFS = $(USBNET_DEFS_GEN) -DDISABLE_PCINET
+
 all: dirs $(BINS)
 
 dirs:
@@ -184,6 +190,10 @@ stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
+stage1-usbnet: $(STAGE1OBJS-USBNET) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
+	$(STRIPCMD) $@
+
 stage1-full: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
@@ -201,8 +211,11 @@ $(STAGE1OBJS-DISK): %-DISK.o: %.c
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
 	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) -c $< -o $@
 
+$(STAGE1OBJS-USBNET): %-USBNET.o: %.c
+	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(USBNET_DEFS) -c $< -o $@
+
 $(STAGE1OBJS-FULL): %-FULL.o: %.c
-	$(COMPILE) $(INCLUDES) $(PCMCIA_DEFS) -c $< -o $@
+	$(COMPILE) $(INCLUDES) $(USBNET_DEFS_GEN) $(PCMCIA_DEFS) -c $< -o $@
 
 .c.o:
 	$(COMPILE) $(INCLUDES) -c $<
@@ -238,3 +251,8 @@ endif
 *-DISK.o: %-DISK.o: %.o
 
 *-NETWORK.o: %-NETWORK.o: %.o
+
+*-USBNET.o: %-USBNET.o: %.o
+
+*-FULL.o: %-FULL.o: %.o
+
-- 
cgit v1.2.1