diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-30 22:37:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-30 22:37:26 +0000 |
| commit | 327e5e69ab62681a943877bf68b98bc406aa272e (patch) | |
| tree | e3ab991cd908d3f5e96505f44caf54ff6425e9a0 /mdk-stage1 | |
| parent | 144146a4fdfea33d8d6b6d704235260cdb1cadc6 (diff) | |
| download | drakx-327e5e69ab62681a943877bf68b98bc406aa272e.tar drakx-327e5e69ab62681a943877bf68b98bc406aa272e.tar.gz drakx-327e5e69ab62681a943877bf68b98bc406aa272e.tar.bz2 drakx-327e5e69ab62681a943877bf68b98bc406aa272e.tar.xz drakx-327e5e69ab62681a943877bf68b98bc406aa272e.zip | |
remove other.img & usb.img, add hd_usb.img & network_gigabit_usb.img
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 68505ff7c..75c00c0ef 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -113,17 +113,17 @@ CDROM_DEFS = -DDISABLE_DISK -DDISABLE_NETWORK STAGE1OBJS-DISK = $(subst .c,-DISK.o,$(STAGE1SRC) $(DISKSRC)) +STAGE1OBJS-DISK-USB = $(subst .c,-DISK-USB.o,$(STAGE1SRC) $(DISKSRC)) DISK_DEFS = -DDISABLE_CDROM -DDISABLE_NETWORK STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC)) +STAGE1OBJS-NETWORK-USB = $(subst .c,-NETWORK-USB.o,$(STAGE1SRC) $(NETWORKSRC)) NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK -STAGE1OBJS-USB = $(subst .c,-USB.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) - STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) @@ -143,7 +143,7 @@ endif BINS = init stage1-full ifeq (i386, $(ARCH)) -BINS += stage1-cdrom stage1-disk stage1-network stage1-usb +BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-disk-usb endif ifneq (ia64, $(ARCH)) @@ -185,11 +185,15 @@ stage1-disk: $(STAGE1OBJS-DISK) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIB $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ +stage1-disk-usb: $(STAGE1OBJS-DISK-USB) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC) + $(CC) $(LDFLAGS_STAGE1) -o $@ $^ + $(STRIPCMD) $@ + stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ -stage1-usb: $(STAGE1OBJS-USB) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC) +stage1-network-usb: $(STAGE1OBJS-NETWORK-USB) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ @@ -207,11 +211,14 @@ $(STAGE1OBJS-CDROM): %-CDROM.o: %.c $(STAGE1OBJS-DISK): %-DISK.o: %.c $(COMPILE) $(INCLUDES) $(DISK_DEFS) -c $< -o $@ +$(STAGE1OBJS-DISK-USB): %-DISK-USB.o: %.c + $(COMPILE) $(INCLUDES) $(DISK_DEFS) $(USB_DEFS_GEN) -c $< -o $@ + $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@ -$(STAGE1OBJS-USB): %-USB.o: %.c - $(COMPILE) $(INCLUDES) $(USB_DEFS) -c $< -o $@ +$(STAGE1OBJS-NETWORK-USB): %-NETWORK-USB.o: %.c + $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-FULL): %-FULL.o: %.c $(COMPILE) $(INCLUDES) $(USB_DEFS_GEN) $(PCMCIA_DEFS) -c $< -o $@ |