Browse Source

Kill off redundant references to the .zprefixes.

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
38dbe14bbe
2 changed files with 6 additions and 53 deletions
  1. 4
    4
      src/Makefile
  2. 2
    49
      src/arch/i386/Makefile

+ 4
- 4
src/Makefile View File

@@ -55,13 +55,13 @@ noargs : blib
55 55
 	@echo
56 56
 	@echo 'For example, '
57 57
 	@echo
58
-	@echo '    make allzroms '
58
+	@echo '    make allroms '
59 59
 	@echo
60
-	@echo 'will generate all possible .zrom (rom burnable) images, and'
60
+	@echo 'will generate all possible .rom (rom burnable) images, and'
61 61
 	@echo
62
-	@echo '    make allzdsks'
62
+	@echo '    make alldsks'
63 63
 	@echo
64
-	@echo 'will generate all possible .zdsk (bootable floppy) images, or'
64
+	@echo 'will generate all possible .dsk (bootable floppy) images, or'
65 65
 	@echo
66 66
 	@echo '===================================================='
67 67
 	@exit 1

+ 2
- 49
src/arch/i386/Makefile View File

@@ -36,74 +36,27 @@ LDSCRIPT		= arch/i386/scripts/i386.lds
36 36
 
37 37
 # Media types.
38 38
 # 
39
-# It's ugly that we have to define these repetitive combinations by
40
-# hand.  Unforunately, $(eval ...) is available only in make >= 3.80,
41
-# and using an external Makefile fragment doesn't work because
42
-# OBJS_xxx need to be defined *before* the external Makefile fragments
43
-# for the source files are generated...
44
-
45
-CFLAGS_ZPREFIX		= -DCOMPRESS
46
-
47 39
 MEDIA			+= rom
48
-OBJS_romprefix		= romprefix zromprefix
49
-CFLAGS_zromprefix	= $(CFLAGS_ZPREFIX)
50
-
51 40
 MEDIA			+= pxe
52
-OBJS_pxeprefix		= pxeprefix zpxeprefix
53
-CFLAGS_zpxeprefix	= $(CFLAGS_ZPREFIX)
54
-
55 41
 MEDIA			+= elf
56
-OBJS_elfprefix		= elfprefix zelfprefix
57
-CFLAGS_zelfprefix	= $(CFLAGS_ZPREFIX)
58
-
59 42
 MEDIA			+= elfd
60
-OBJS_elfdprefix		= elfdprefix zelfdprefix
61
-CFLAGS_zelfdprefix	= $(CFLAGS_ZPREFIX)
62
-
63 43
 MEDIA			+= lmelf
64
-OBJS_lmelfprefix	= lmelfprefix zlmelfprefix
65
-CFLAGS_zlmelfprefix	= $(CFLAGS_ZPREFIX)
66
-
67 44
 MEDIA			+= lmelfd
68
-OBJS_lmelfdprefix	= lmelfdprefix zlmelfdprefix
69
-CFLAGS_zlmelfdprefix	= $(CFLAGS_ZPREFIX)
70
-
71 45
 MEDIA			+= lkrn
72
-OBJS_lkrnprefix		= lkrnprefix zlkrnprefix
73
-CFLAGS_zlkrnprefix	= $(CFLAGS_ZPREFIX)
74
-
75 46
 MEDIA			+= bImage
76
-OBJS_bImageprefix	= bImageprefix zbImageprefix
77
-CFLAGS_zbImageprefix	= $(CFLAGS_ZPREFIX)
78
-
79 47
 MEDIA			+= dsk
80
-OBJS_dskprefix		= dskprefix zdskprefix
81
-CFLAGS_zdskprefix	= $(CFLAGS_ZPREFIX)
82
-
83 48
 MEDIA			+= nbi
84
-OBJS_nbiprefix		= nbiprefix znbiprefix
85
-CFLAGS_znbiprefix	= $(CFLAGS_ZPREFIX)
86
-
87 49
 MEDIA			+= hd
88
-OBJS_hdprefix		= hdprefix zhdprefix
89
-CFLAGS_zhdprefix	= $(CFLAGS_ZPREFIX)
90
-
91 50
 MEDIA			+= raw
92
-OBJS_rawprefix		= rawprefix zrawprefix
93
-CFLAGS_zrawprefix	= $(CFLAGS_ZPREFIX)
94
-
95
-# These media cannot handle compressed payloads
96
-
97 51
 MEDIA			+= com
98
-
99 52
 MEDIA			+= exe
100 53
 
101 54
 # Special target for building Master Boot Record binary
102 55
 $(BIN)/mbr.bin : $(BIN)/mbr.o
103 56
 	$(OBJCOPY) -O binary $< $@
104 57
 
105
-# Some suffixes (e.g. %.zfd0) are generated directly from other
106
-# finished files (e.g. %.zdsk), rather than having their own prefix.
58
+# Some suffixes (e.g. %.fd0) are generated directly from other
59
+# finished files (e.g. %.dsk), rather than having their own prefix.
107 60
 
108 61
 # rule to write disk images to /dev/fd0
109 62
 NON_AUTO_MEDIA		+= fd0

Loading…
Cancel
Save