diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2004-01-22 15:42:13 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2004-01-22 15:42:13 +0000 |
| commit | 79a45f42e391f892f736b208fec77a3d0f306702 (patch) | |
| tree | 49bd6e432a71eb023debe6ea88a487244b193886 | |
| parent | 98d1f8c321a0caf7f75a6d7e863e3c4ef3669f05 (diff) | |
| download | drakx-79a45f42e391f892f736b208fec77a3d0f306702.tar drakx-79a45f42e391f892f736b208fec77a3d0f306702.tar.gz drakx-79a45f42e391f892f736b208fec77a3d0f306702.tar.bz2 drakx-79a45f42e391f892f736b208fec77a3d0f306702.tar.xz drakx-79a45f42e391f892f736b208fec77a3d0f306702.zip | |
stage1-network-usb is deprecated
| -rw-r--r-- | mdk-stage1/Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 8b8166f16..4a49ca2b8 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -144,7 +144,6 @@ MEDIAS-USB_DEFS = -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 @@ -173,10 +172,10 @@ endif BINS = init stage1-full ifeq (i386, $(ARCH)) -BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-medias-usb +BINS += stage1-cdrom stage1-disk stage1-network stage1-medias-usb endif ifeq (x86_64, $(ARCH)) -BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-medias-usb +BINS += stage1-cdrom stage1-disk stage1-network stage1-medias-usb endif ifeq (i386, $(ARCH)) @@ -233,10 +232,6 @@ stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(DIET) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ -stage1-network-usb: $(STAGE1OBJS-NETWORK-USB) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ - $(STRIPCMD) $@ - stage1-full: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) $(DIET) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ @@ -258,10 +253,7 @@ $(STAGE1OBJS-MEDIAS-USB): %-MEDIAS-USB.o: %.c $(DIET) $(COMPILE) $(INCLUDES) $(MEDIAS-USB_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@ - -$(STAGE1OBJS-NETWORK-USB): %-NETWORK-USB.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(USB_DEFS_GEN) -c $< -o $@ + $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-FULL): %-FULL.o: %.c $(DIET) $(COMPILE) $(INCLUDES) $(USB_DEFS_GEN) $(PCMCIA_DEFS) -c $< -o $@ @@ -306,7 +298,5 @@ endif *-NETWORK.o: %-NETWORK.o: %.o -*-NETWORK-USB.o: %-NETWORK-USB.o: %.o - *-FULL.o: %-FULL.o: %.o |