Follow-up to commit e69b42c : five more Makefiles now use the 'centra…

…lized' demo-building bits from common/libobjs.mif
Bill-Gray · Feb 18, 2024 · 9a6e9d2 · 9a6e9d2
1 parent a6299ec
commit 9a6e9d2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 220 deletions.
diff --git a/fb/Makefile b/fb/Makefile
@@ -112,54 +112,12 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c
 $(PDCOBJS) : %.o: $(osdir)/%.c
 	$(BUILD) $(SFLAGS) -c $<
 
-calendar$(E) : $(demodir)/calendar.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-firework$(E) : $(demodir)/firework.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-init_col$(E) : $(demodir)/init_col.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-mbrot$(E) : $(demodir)/mbrot.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ozdemo$(E) : $(demodir)/ozdemo.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-newtest$(E) : $(demodir)/newtest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-picsview$(E) : $(demodir)/picsview.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ptest$(E) : $(demodir)/ptest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-rain$(E) : $(demodir)/rain.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-speed$(E) : $(demodir)/speed.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-testcurs$(E) : $(demodir)/testcurs.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-test_pan$(E) : $(demodir)/test_pan.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
+$(DEMOS_EXCEPT_TUIDEMO): %: $(demodir)/%.c
+	$(BUILD) $(DEMOFLAGS) -o$@ $< $(LDFLAGS)
 
 tuidemo$(E) : tuidemo.o tui.o
 	$(LINK) tui.o tuidemo.o -o $@ $(LDFLAGS)
 
-widetest$(E) : $(demodir)/widetest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-worm$(E) : $(demodir)/worm.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-xmas$(E) : $(demodir)/xmas.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 tui.o: $(demodir)/tui.c $(demodir)/tui.h
 	$(BUILD) -c $(DEMOFLAGS) $(demodir)/tui.c
 

diff --git a/gl/Makefile b/gl/Makefile
@@ -169,58 +169,16 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c
 $(PDCOBJS) : %.o: $(osdir)/%.c
 	$(BUILD) $(SFLAGS) -c $<
 
-calendar$(E): $(demodir)/calendar.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-firework$(E): $(demodir)/firework.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-init_col$(E): $(demodir)/init_col.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-mbrot$(E): $(demodir)/mbrot.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ozdemo$(E): $(demodir)/ozdemo.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-picsview$(E): $(demodir)/picsview.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ptest$(E): $(demodir)/ptest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-newtest$(E): $(demodir)/newtest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-rain$(E): $(demodir)/rain.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-speed$(E): $(demodir)/speed.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-testcurs$(E): $(demodir)/testcurs.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-test_pan$(E): $(demodir)/test_pan.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
+$(DEMOS_EXCEPT_TUIDEMO): %: $(demodir)/%.c
+	$(BUILD) $(DEMOFLAGS) -o$@ $< $(LDFLAGS)
 
 tuidemo$(E): tuidemo.o tui.o
 	$(LINK) tui.o tuidemo.o -o $@ $(LDFLAGS)
 
-worm$(E): $(demodir)/worm.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-xmas$(E): $(demodir)/xmas.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 tui.o: $(demodir)/tui.c $(demodir)/tui.h
 	$(BUILD) -c $(DEMOFLAGS) $(demodir)/tui.c
 
 tuidemo.o: $(demodir)/tuidemo.c
 	$(BUILD) -c $(DEMOFLAGS) $(demodir)/tuidemo.c
 
-widetest$(E): $(demodir)/widetest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 include $(demodir)/nctests.mif
diff --git a/sdl1/Makefile b/sdl1/Makefile
@@ -108,54 +108,12 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c
 $(PDCOBJS) : %.o: $(osdir)/%.c
 	$(BUILD) $(SFLAGS) -c $<
 
-calendar: $(demodir)/calendar.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-firework: $(demodir)/firework.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-init_col: $(demodir)/init_col.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-mbrot: $(demodir)/mbrot.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-newtest: $(demodir)/newtest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ozdemo: $(demodir)/ozdemo.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-picsview: $(demodir)/picsview.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ptest: $(demodir)/ptest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-rain: $(demodir)/rain.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-speed: $(demodir)/speed.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-testcurs: $(demodir)/testcurs.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-test_pan: $(demodir)/test_pan.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
+$(DEMOS_EXCEPT_TUIDEMO): %: $(demodir)/%.c
+	$(BUILD) $(DEMOFLAGS) -o$@ $< $(LDFLAGS)
 
 tuidemo: tuidemo.o tui.o
 	$(LINK) tui.o tuidemo.o -o $@ $(LDFLAGS)
 
-widetest: $(demodir)/widetest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-worm: $(demodir)/worm.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-xmas: $(demodir)/xmas.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 sdltest: $(osdir)/sdltest.c
 	$(BUILD) $(DEMOFLAGS) $(SFLAGS) -o $@ $< $(LDFLAGS)
 

diff --git a/sdl2/Makefile b/sdl2/Makefile
@@ -172,51 +172,12 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c
 $(PDCOBJS) : %.o: $(osdir)/%.c
 	$(BUILD) $(SFLAGS) -c $<
 
-calendar$(E): $(demodir)/calendar.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-firework$(E): $(demodir)/firework.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-init_col$(E): $(demodir)/init_col.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-mbrot$(E): $(demodir)/mbrot.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ozdemo$(E): $(demodir)/ozdemo.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-picsview$(E): $(demodir)/picsview.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ptest$(E): $(demodir)/ptest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-newtest$(E): $(demodir)/newtest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-rain$(E): $(demodir)/rain.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-speed$(E): $(demodir)/speed.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-testcurs$(E): $(demodir)/testcurs.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-test_pan$(E): $(demodir)/test_pan.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
+$(DEMOS_EXCEPT_TUIDEMO): %: $(demodir)/%.c
+	$(BUILD) $(DEMOFLAGS) -o$@ $< $(LDFLAGS)
 
 tuidemo$(E): tuidemo.o tui.o
 	$(LINK) tui.o tuidemo.o -o $@ $(LDFLAGS)
 
-worm$(E): $(demodir)/worm.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-xmas$(E): $(demodir)/xmas.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 sdltest$(E): $(osdir)/sdltest.c
 	$(BUILD) $(SFLAGS) $(DEMOFLAGS) -o $@ $< $(LIBCURSES) $(SLIBS)
 
@@ -226,7 +187,4 @@ tui.o: $(demodir)/tui.c $(demodir)/tui.h
 tuidemo.o: $(demodir)/tuidemo.c
 	$(BUILD) -c $(DEMOFLAGS) $(demodir)/tuidemo.c
 
-widetest$(E): $(demodir)/widetest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 include $(demodir)/nctests.mif
diff --git a/vt/Makefile b/vt/Makefile
@@ -138,54 +138,12 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c
 $(PDCOBJS) : %.o: $(osdir)/%.c
 	$(BUILD) $(SFLAGS) -c $<
 
-calendar$(E) : $(demodir)/calendar.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-firework$(E) : $(demodir)/firework.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-init_col$(E) : $(demodir)/init_col.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-mbrot$(E) : $(demodir)/mbrot.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ozdemo$(E) : $(demodir)/ozdemo.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-newtest$(E) : $(demodir)/newtest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-picsview$(E) : $(demodir)/picsview.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-ptest$(E) : $(demodir)/ptest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-rain$(E) : $(demodir)/rain.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-speed$(E) : $(demodir)/speed.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-testcurs$(E) : $(demodir)/testcurs.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-test_pan$(E) : $(demodir)/test_pan.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
+$(DEMOS_EXCEPT_TUIDEMO): %: $(demodir)/%.c
+	$(BUILD) $(DEMOFLAGS) -o$@ $< $(LDFLAGS)
 
 tuidemo$(E) : tuidemo.o tui.o
 	$(LINK) tui.o tuidemo.o -o $@ $(LDFLAGS)
 
-widetest$(E) : $(demodir)/widetest.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-worm$(E) : $(demodir)/worm.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
-xmas$(E) : $(demodir)/xmas.c
-	$(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS)
-
 tui.o: $(demodir)/tui.c $(demodir)/tui.h
 	$(BUILD) -c $(DEMOFLAGS) $(demodir)/tui.c