Explorar el Código

[build] Provide %.fd0 build targets only for pcbios

Originally-fixed-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown hace 14 años
padre
commit
42a1f43bf9
Se han modificado 3 ficheros con 12 adiciones y 15 borrados
  1. 5
    0
      src/Makefile.housekeeping
  2. 0
    15
      src/arch/i386/Makefile
  3. 7
    0
      src/arch/i386/Makefile.pcbios

+ 5
- 0
src/Makefile.housekeeping Ver fichero

@@ -831,6 +831,11 @@ $(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN)
831 831
 # ROMS), and (b) the linker is so fast that it probably wouldn't make
832 832
 # much difference to the overall build time.
833 833
 
834
+# Add NON_AUTO_MEDIA to the media list, so that they show up in the
835
+# output of "make"
836
+#
837
+MEDIA		+= $(NON_AUTO_MEDIA)
838
+
834 839
 media :
835 840
 	@$(ECHO) $(MEDIA)
836 841
 

+ 0
- 15
src/arch/i386/Makefile Ver fichero

@@ -102,18 +102,3 @@ include arch/x86/Makefile
102 102
 #
103 103
 MAKEDEPS	+= arch/i386/Makefile.$(PLATFORM)
104 104
 include arch/i386/Makefile.$(PLATFORM)
105
-
106
-# Some suffixes (e.g. %.fd0) are generated directly from other
107
-# finished files (e.g. %.dsk), rather than having their own prefix.
108
-
109
-# rule to write disk images to /dev/fd0
110
-NON_AUTO_MEDIA	+= fd0
111
-%fd0 : %dsk
112
-	$(QM)$(ECHO) "  [DD] $@"
113
-	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
114
-	$(Q)sync
115
-
116
-# Add NON_AUTO_MEDIA to the media list, so that they show up in the
117
-# output of "make"
118
-#
119
-MEDIA		+= $(NON_AUTO_MEDIA)

+ 7
- 0
src/arch/i386/Makefile.pcbios Ver fichero

@@ -55,6 +55,13 @@ NON_AUTO_MEDIA	+= sdsk
55 55
 	$(QM)$(ECHO) "  [GENSDSK] $@"
56 56
 	$(Q)bash util/gensdsk $@ $<
57 57
 
58
+# rule to write disk images to /dev/fd0
59
+NON_AUTO_MEDIA	+= fd0
60
+%fd0 : %dsk
61
+	$(QM)$(ECHO) "  [DD] $@"
62
+	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
63
+	$(Q)sync
64
+
58 65
 # Special target for building Master Boot Record binary
59 66
 $(BIN)/mbr.bin : $(BIN)/mbr.o
60 67
 	$(QM)$(ECHO) "  [OBJCOPY] $@"

Loading…
Cancelar
Guardar