Merge branch 'master' into fixmakefiles
This commit is contained in:
@@ -56,7 +56,7 @@ ifdef QUIET
|
|||||||
PQ = "QUIET=1"
|
PQ = "QUIET=1"
|
||||||
PD = --no-print-directory
|
PD = --no-print-directory
|
||||||
ifndef CMD_EXE
|
ifndef CMD_EXE
|
||||||
CATERR = 2> $$@.errlog || (cat $$@.errlog && false)
|
CATERR = 2> $@.errlog || (cat $@.errlog && false)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -967,7 +967,7 @@ testcode.atr: testcode
|
|||||||
# Clean-up rules
|
# Clean-up rules
|
||||||
|
|
||||||
mostlyclean:
|
mostlyclean:
|
||||||
@$(DEL) *.lbl *.map *.o 2>$(NULLDEV)
|
@$(DEL) *.errlog *.lbl *.map *.o 2>$(NULLDEV)
|
||||||
# we cant use .s since we have asm files in the directory that we want to keep
|
# we cant use .s since we have asm files in the directory that we want to keep
|
||||||
@$(DEL) ${patsubst %.c,%.s,$(wildcard *.c)} 2>$(NULLDEV)
|
@$(DEL) ${patsubst %.c,%.s,$(wildcard *.c)} 2>$(NULLDEV)
|
||||||
|
|
||||||
|
|||||||
@@ -128,6 +128,6 @@ testcode.d64: testcode
|
|||||||
# $(foreach file,$(EMD) $(MOU) $(TGI),$(D64_WRITE_SEQ_recipe))
|
# $(foreach file,$(EMD) $(MOU) $(TGI),$(D64_WRITE_SEQ_recipe))
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@$(DEL) *.lbl petscii.prg cbmdir-test.prg 2>$(NULLDEV)
|
@$(DEL) *.lbl petscii.prg cbmdir-test.prg cbmread.prg 2>$(NULLDEV)
|
||||||
@$(DEL) $(DISK_c64)
|
@$(DEL) $(DISK_c64)
|
||||||
@$(DEL) $(DISK_vic20)
|
@$(DEL) $(DISK_vic20)
|
||||||
|
|||||||
Reference in New Issue
Block a user