From eab2a490f4bcf5f2d9568d91b872fdb704edfd9e Mon Sep 17 00:00:00 2001 From: John Schneiderman Date: Wed, 7 Aug 2024 20:39:05 +0200 Subject: [PATCH] Adds the tests to the all target. Silences the cleaning targets. --- autotest/makefile | 2 +- make/makefile | 14 ++++++++---- samples/fractals/makefile | 2 +- samples/games/makefile | 2 +- samples/hires/makefile | 2 +- samples/hiresmc/makefile | 2 +- samples/kernalio/makefile | 2 +- samples/makefile | 44 +++++++++++++++++++------------------- samples/memmap/makefile | 2 +- samples/particles/makefile | 2 +- samples/rasterirq/makefile | 2 +- samples/scrolling/makefile | 2 +- samples/sprites/makefile | 2 +- samples/stdio/makefile | 2 +- 14 files changed, 44 insertions(+), 38 deletions(-) diff --git a/autotest/makefile b/autotest/makefile index 29ec3cb..801f13b 100644 --- a/autotest/makefile +++ b/autotest/makefile @@ -47,4 +47,4 @@ stripedarraytest: stripedarraytest.c $(CC) -e -O3 -n $< clean: - $(RM) *.asm *.bcs *.int *.lbl *.map *.prg + @$(RM) *.asm *.bcs *.int *.lbl *.map *.prg diff --git a/make/makefile b/make/makefile index 9df830e..504d421 100644 --- a/make/makefile +++ b/make/makefile @@ -26,7 +26,7 @@ else endif -all: --prep-build-dir compiler samples +all: --prep-build-dir compiler samples tests %.o: $(project_dir)/oscar64/%.cpp @@ -53,18 +53,24 @@ clean : @$(RM) $(srcdir)/*.o @$(RM) $(srcdir)/*.d @$(RM) $(project_dir)/bin/oscar64 - $(MAKE) -C $(project_dir)/samples clean + @$(MAKE) -C $(project_dir)/samples clean + @$(MAKE) -C $(project_dir)/autotest clean .PHONY : distclean distclean : @$(REMOVE_FORCE_ALL) $(srcdir) @$(REMOVE_FORCE_ALL) $(project_dir)/bin - $(MAKE) -C $(project_dir)/samples clean + @$(MAKE) -C $(project_dir)/samples clean + @$(MAKE) -C $(project_dir)/autotest clean samples: compiler - $(MAKE) -C $(project_dir)/samples all + @$(MAKE) -C $(project_dir)/samples all + + +tests: compiler + @$(MAKE) -C $(project_dir)/autotest all ifeq ($(UNAME_S), Darwin) diff --git a/samples/fractals/makefile b/samples/fractals/makefile index 0a81c92..3f415c8 100644 --- a/samples/fractals/makefile +++ b/samples/fractals/makefile @@ -13,4 +13,4 @@ mbzoom.prg: mbzoom.c $(CC) $(CFLAGS) -O3 $< clean: - $(RM) *.asm *.int *.lbl *.map *.prg + @$(RM) *.asm *.int *.lbl *.map *.prg diff --git a/samples/games/makefile b/samples/games/makefile index 4b89db4..38582fc 100644 --- a/samples/games/makefile +++ b/samples/games/makefile @@ -16,4 +16,4 @@ hscrollshmup.prg: hscrollshmup.c $(CC) $(CFLAGS) -O2 $< clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/hires/makefile b/samples/hires/makefile index 1159dda..559cedc 100644 --- a/samples/hires/makefile +++ b/samples/hires/makefile @@ -10,4 +10,4 @@ splitscreen.prg: splitscreen.c $(CC) $< clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/hiresmc/makefile b/samples/hiresmc/makefile index 750e15f..c9c7f04 100644 --- a/samples/hiresmc/makefile +++ b/samples/hiresmc/makefile @@ -7,4 +7,4 @@ CFLAGS=-n all: func3d.prg polygon.prg floodfill.prg paint.prg clean: - $(RM) *.asm *.int *.lbl *.map *.prg + @$(RM) *.asm *.int *.lbl *.map *.prg diff --git a/samples/kernalio/makefile b/samples/kernalio/makefile index 0c921c2..48021a2 100644 --- a/samples/kernalio/makefile +++ b/samples/kernalio/makefile @@ -7,4 +7,4 @@ CFLAGS= all: diskdir.prg filewrite.prg fileread.prg charwrite.prg charread.prg hireswrite.prg hiresread.prg clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/makefile b/samples/makefile index adc9956..e649448 100644 --- a/samples/makefile +++ b/samples/makefile @@ -1,25 +1,25 @@ all: - $(MAKE) -C fractals - $(MAKE) -C games - $(MAKE) -C hires - $(MAKE) -C hiresmc - $(MAKE) -C particles - $(MAKE) -C kernalio - $(MAKE) -C memmap - $(MAKE) -C rasterirq - $(MAKE) -C scrolling - $(MAKE) -C sprites - $(MAKE) -C stdio + @$(MAKE) -C fractals + @$(MAKE) -C games + @$(MAKE) -C hires + @$(MAKE) -C hiresmc + @$(MAKE) -C particles + @$(MAKE) -C kernalio + @$(MAKE) -C memmap + @$(MAKE) -C rasterirq + @$(MAKE) -C scrolling + @$(MAKE) -C sprites + @$(MAKE) -C stdio clean: - $(MAKE) -C fractals $@ - $(MAKE) -C games $@ - $(MAKE) -C hires $@ - $(MAKE) -C hiresmc $@ - $(MAKE) -C particles $@ - $(MAKE) -C kernalio $@ - $(MAKE) -C memmap $@ - $(MAKE) -C rasterirq $@ - $(MAKE) -C scrolling $@ - $(MAKE) -C sprites $@ - $(MAKE) -C stdio $@ + @$(MAKE) -C fractals $@ + @$(MAKE) -C games $@ + @$(MAKE) -C hires $@ + @$(MAKE) -C hiresmc $@ + @$(MAKE) -C particles $@ + @$(MAKE) -C kernalio $@ + @$(MAKE) -C memmap $@ + @$(MAKE) -C rasterirq $@ + @$(MAKE) -C scrolling $@ + @$(MAKE) -C sprites $@ + @$(MAKE) -C stdio $@ diff --git a/samples/memmap/makefile b/samples/memmap/makefile index c14cb6d..8f59a02 100644 --- a/samples/memmap/makefile +++ b/samples/memmap/makefile @@ -26,4 +26,4 @@ overlay.prg: overlay.c $(CC) $(CFLAGS) $< -n -d64=overlay.d64 clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs *.d64 *.crt + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs *.d64 *.crt diff --git a/samples/particles/makefile b/samples/particles/makefile index 3826e7f..0e8aaa2 100644 --- a/samples/particles/makefile +++ b/samples/particles/makefile @@ -7,4 +7,4 @@ CFLAGS=-n all: fireworks_ptr.prg fireworks_hires.prg fireworks_stripe.prg clean: - $(RM) *.asm *.int *.lbl *.map *.prg + @$(RM) *.asm *.int *.lbl *.map *.prg diff --git a/samples/rasterirq/makefile b/samples/rasterirq/makefile index db1239c..8a62c01 100644 --- a/samples/rasterirq/makefile +++ b/samples/rasterirq/makefile @@ -10,4 +10,4 @@ movingbars.prg: movingbars.c $(CC) $(CFLAGS) $< -n clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/scrolling/makefile b/samples/scrolling/makefile index b20a190..e7c13cd 100644 --- a/samples/scrolling/makefile +++ b/samples/scrolling/makefile @@ -7,4 +7,4 @@ CFLAGS=-n all: bigfont.prg tunnel.prg grid2d.prg colorram.prg cgrid8way.prg clean: - $(RM) *.asm *.int *.lbl *.map *.prg + @$(RM) *.asm *.int *.lbl *.map *.prg diff --git a/samples/sprites/makefile b/samples/sprites/makefile index b5d8df1..f3593c6 100644 --- a/samples/sprites/makefile +++ b/samples/sprites/makefile @@ -13,4 +13,4 @@ sprmux32.prg: sprmux32.c $(CC) $(CFLAGS) $< -O2 -dVSPRITES_MAX=32 -dNUM_IRQS=28 clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/stdio/makefile b/samples/stdio/makefile index ca86830..bc7e790 100644 --- a/samples/stdio/makefile +++ b/samples/stdio/makefile @@ -7,4 +7,4 @@ CFLAGS= all: helloworld.prg clean: - $(RM) *.asm *.int *.lbl *.map *.prg *.bcs + @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs