diff options
Diffstat (limited to 'bootblocks/Makefile')
-rw-r--r-- | bootblocks/Makefile | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/bootblocks/Makefile b/bootblocks/Makefile index 6efa75b..40e7817 100644 --- a/bootblocks/Makefile +++ b/bootblocks/Makefile @@ -2,15 +2,15 @@ HOSTCC=cc HOSTCCFLAGS=-O BCC=bcc +AS86=as86 +DEFS= CC=$(BCC) -CFLAGS=-ansi -Ms -Oi -O -s +CFLAGS=-ansi -Ms -Oi -O -s $(DEFS) # CFLAGS=-ansi -Ms ASFLAGS=-0 -w MINIXDEFS=-DDOTS -MONDEFS= # LST=-l $*.lst -# CLST=-A-l -A$*.lst default: makeboot makeboot.com monitor.out minix_elks.bin lsys.com @@ -20,7 +20,7 @@ bootsys: bootfile.sys boottar.sys bootminix.sys CSRC=minix.c SSRC=sysboot.s tarboot.s skip.s com_bcc.s tich.s mbr.s msdos.s noboot.s \ - boot_fpy.s + boot_fpy.s killhd.s encap: $(SSRC:s=v) $(CSRC:c=v) minixhd.v msdos16.v bootbin: $(SSRC:s=bin) $(CSRC:c=bin) minixhd.bin msdos16.bin minix_elks.bin @@ -39,10 +39,13 @@ EXTRAS=minix.h elf_info.c elf_info.h standalone.c li86.s \ install: +monitor.com: $(MOBJ) + $(CC) $(CFLAGS) $(MONDEFS) -H0x10000 -d $(MOBJ) -o monitor.com -M > monitor.sym + monitor.out: $(MOBJ) $(CC) $(CFLAGS) $(MONDEFS) -H0x10000 $(MOBJ) -o monitor.out -M > monitor.sym -$(MOBJ): $(MINC) version.h +$(MOBJ): $(MINC) fs_min.o: minix.h bootfile.sys: $(MSRC) $(MINC) @@ -72,13 +75,13 @@ monitor: $(MSRC) $(MINC) bzimage.o: bzimage.c zimage.v minix.s: minix.c Makefile - $(BCC) -Mf -O -DTRY_FLOPPY $(MINIXDEFS) -S minix.c + $(CC) -Mf -O -DTRY_FLOPPY $(MINIXDEFS) -S minix.c minix_elks.s: minix_elks.c Makefile minix.v - $(BCC) -Mf -O $(MINIXDEFS) -S minix_elks.c + $(CC) -Mf -O $(MINIXDEFS) -S minix_elks.c minixhd.s: minix.c Makefile - $(BCC) -Mf -O -DHARDDISK $(MINIXDEFS) -S minix.c -o minixhd.s + $(CC) -Mf -O -DHARDDISK $(MINIXDEFS) -S minix.c -o minixhd.s msdos16.s: msdos.s sed 's/^fatbits=12/fatbits=16/' < msdos.s > msdos16.s @@ -87,19 +90,15 @@ makeboot: makeboot.c $(BOOTBLOCKS) $(HOSTCC) $(HOSTCCFLAGS) -o makeboot makeboot.c makeboot.com: makeboot.c $(BOOTBLOCKS) - $(BCC) -Md -O -o makeboot.com makeboot.c + $(CC) -Md -O -o makeboot.com makeboot.c lsys.com: lsys.c msdos.v msdos16.v - $(BCC) -Md -O -o lsys.com lsys.c - -version.h: - head -1 ../Libc_version | \ - sed 's/\(.*\)/#define VERSION "\1"/' > version.h + $(CC) -Md -O -o lsys.com lsys.c clean realclean: rm -f bootfile.sys boottar.sys bootminix.sys rm -f monitor makeboot bootblocks.tar.gz - rm -f minix.s minixhd.s minix_elks.s version.h msdos16.s + rm -f minix.s minixhd.s minix_elks.s msdos16.s rm -f *.com *.o *.bin *.out *.lst *.sym *.v *.tmp tgz: minix.bin monitor.out makeboot.com makeboot @@ -121,9 +120,7 @@ distribution: .SUFFIXES: .bin .v .s.bin: - $(BCC) -W -c $*.s -A-u- -A-b -A$*.tmp -A-s -A$*.sym $(CLST) - mv $*.tmp $*.bin - -@rm $*.o + $(AS86) -w- -0 -b $*.bin -s $*.sym $*.s $(LST) .s.v: as86_encap $*.s $*.v $*_ $(ASFLAGS) $(LST) |