diff options
| -rw-r--r-- | src/Makefile.housekeeping | 5 | ||||
| -rw-r--r-- | src/arch/i386/Makefile | 15 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.pcbios | 7 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 8f0c87f3..5220b700 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -831,6 +831,11 @@ $(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN) # ROMS), and (b) the linker is so fast that it probably wouldn't make # much difference to the overall build time. +# Add NON_AUTO_MEDIA to the media list, so that they show up in the +# output of "make" +# +MEDIA += $(NON_AUTO_MEDIA) + media : @$(ECHO) $(MEDIA) diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 840cc763..bb30f1da 100644 --- a/src/arch/i386/Makefile +++ b/src/arch/i386/Makefile @@ -102,18 +102,3 @@ include arch/x86/Makefile # MAKEDEPS += arch/i386/Makefile.$(PLATFORM) include arch/i386/Makefile.$(PLATFORM) - -# Some suffixes (e.g. %.fd0) are generated directly from other -# finished files (e.g. %.dsk), rather than having their own prefix. - -# rule to write disk images to /dev/fd0 -NON_AUTO_MEDIA += fd0 -%fd0 : %dsk - $(QM)$(ECHO) " [DD] $@" - $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0 - $(Q)sync - -# Add NON_AUTO_MEDIA to the media list, so that they show up in the -# output of "make" -# -MEDIA += $(NON_AUTO_MEDIA) diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios index 7f3032a0..2a2c2667 100644 --- a/src/arch/i386/Makefile.pcbios +++ b/src/arch/i386/Makefile.pcbios @@ -55,6 +55,13 @@ NON_AUTO_MEDIA += sdsk $(QM)$(ECHO) " [GENSDSK] $@" $(Q)bash util/gensdsk $@ $< +# rule to write disk images to /dev/fd0 +NON_AUTO_MEDIA += fd0 +%fd0 : %dsk + $(QM)$(ECHO) " [DD] $@" + $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0 + $(Q)sync + # Special target for building Master Boot Record binary $(BIN)/mbr.bin : $(BIN)/mbr.o $(QM)$(ECHO) " [OBJCOPY] $@" |