patch-2.0.21-2.1.0 linux/arch/i386/boot/Makefile

• Lines: 39
• Date: Fri Sep 20 18:43:03 1996
• Orig file: lx2.0/v2.0.21/linux/arch/i386/boot/Makefile
• Orig date: Wed Jul 17 14:59:14 1996

diff -u --recursive --new-file lx2.0/v2.0.21/linux/arch/i386/boot/Makefile linux/arch/i386/boot/Makefile
@@ -8,38 +8,28 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-ifdef CONFIG_KERNEL_ELF
 HOSTCFLAGS := $(HOSTCFLAGS) -D__BFD__
-endif
 
 ifdef SMP
 HOSTCFLAGS := $(HOSTCFLAGS) -D__SMP__
 endif
 
 zImage: $(CONFIGURE) bootsect setup compressed/vmlinux tools/build
-ifdef CONFIG_KERNEL_ELF
 	if hash $(ENCAPS) 2> /dev/null; then \
 	  $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(ZIMAGE_OFFSET) compressed/vmlinux > compressed/vmlinux.out; \
 	else \
 	  $(OBJCOPY) compressed/vmlinux compressed/vmlinux.out; \
 	fi
 	tools/build bootsect setup compressed/vmlinux.out $(ROOT_DEV) > zImage
-else
-	tools/build bootsect setup compressed/vmlinux $(ROOT_DEV) > zImage
-endif
 	sync
 
 bzImage: $(CONFIGURE) bbootsect setup compressed/bvmlinux tools/bbuild
-ifdef CONFIG_KERNEL_ELF
 	if hash $(ENCAPS) 2> /dev/null; then \
 	  $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(IMAGE_OFFSET) compressed/bvmlinux > compressed/bvmlinux.out; \
 	else \
 	  $(OBJCOPY) compressed/bvmlinux compressed/bvmlinux.out; \
 	fi
 	tools/bbuild bbootsect setup compressed/bvmlinux.out $(ROOT_DEV) > bzImage
-else
-	tools/bbuild bbootsect setup compressed/bvmlinux $(ROOT_DEV) > bzImage
-endif
 	sync
 
 compressed/vmlinux: $(TOPDIR)/vmlinux