# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1645796213 -7200
# Node ID 72513168d94e10d885245892ae137d0cffe5212e
# Parent  c58cd7797aff255fdda446116e3bd73c5383251d
Improve build system.

diff -r c58cd7797aff -r 72513168d94e Makefile.gen
--- a/Makefile.gen	Fri Feb 25 15:33:38 2022 +0200
+++ b/Makefile.gen	Fri Feb 25 15:36:53 2022 +0200
@@ -358,34 +358,34 @@
 
 
 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(DMLIB)tests/%.c
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(DMLIB)tools/%.c
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: %.c %.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: %.c
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(MINIJSS)%.c
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(DMLIB_SRC)%.c $(DMLIB_SRC)%.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)%.o: $(DMLIB_SRC)%.c
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 
 ###
@@ -395,49 +395,49 @@
 	(echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
 
 $(OBJPATH)dmimage.o: $(DMLIB_SRC)dmimage.c $(DMLIB_SRC)stb_image.c $(DMLIB_SRC)dmimage.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)dmresw.o: $(DMLIB_SRC)dmresw.c $(DMLIB_SRC)dmres.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 
 $(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(OBJPATH)jss.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(OBJPATH)jssmod.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(OBJPATH)jssmix.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 
 $(OBJPATH)dmblit.o: $(DMLIB_SRC)dmblit.c $(DMLIB_SRC)dmscaledblit.h $(DMLIB_SRC)dmunscaledblit.h $(DMLIB_SRC)dmblitfunc.h $(DMLIB_SRC)dmlib.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)dmline.o: $(DMLIB_SRC)dmline.c $(DMLIB_SRC)dmdrawline.h $(DMLIB_SRC)dmlinefunc.h $(DMLIB_SRC)dmlineclip.h $(DMLIB_SRC)dmlib.h
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)libgfx.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h $(DMLIB_A)
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)lib64gfx.o: $(DMLIB)tools/lib64gfx.c $(DMLIB)tools/lib64gfx.h $(OBJPATH)libgfx.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)lib64util.o: $(DMLIB)tools/lib64util.c $(DMLIB)tools/lib64util.h $(OBJPATH)lib64gfx.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)lib64fmts.o: $(DMLIB)tools/lib64fmts.c $(OBJPATH)lib64gfx.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)64vw.o: $(DMLIB)tools/64vw.c $(OBJPATH)lib64util.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)gfxconv.o: $(DMLIB)tools/gfxconv.c $(OBJPATH)lib64util.o
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \
 	$(OBJPATH)libgutil.o $(DMLIB_A)
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 
 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
@@ -455,67 +455,67 @@
 
 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
 		setupmenubar.h setupfont.h setupimage.h dmsimple.c)
-	$(COMPILE_C_OBJ)
+	$(call COMPILE_C_OBJ,)
 
 
 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen $(DM_CONFIG)
-	$(LINK_STATIC_LIB)
+	$(call LINK_STATIC_LIB,)
 
 
 ###
 ### Tests
 ###
 $(TESTS_BINPATH)blittest$(BINEXT): $(OBJPATH)blittest.o $(DMLIB_A)
-	$(LINK_C_BIN) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm)
 
 $(TESTS_BINPATH)dzlibtest$(BINEXT): $(OBJPATH)dzlibtest.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS))
 
 $(TESTS_BINPATH)plrtest$(BINEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) -lm)
 
 $(TESTS_BINPATH)%test$(BINEXT): $(OBJPATH)%test.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm)
 
 
 ###
 ### Tools
 ###
 $(TOOL_BINPATH)fontconv$(BINEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(ZLIB_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(ZLIB_LDFLAGS) -lm)
 
 $(TOOL_BINPATH)data2inc$(BINEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS))
 
 $(TOOL_BINPATH)packed$(BINEXT): $(OBJPATH)packed.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS))
 
 $(TOOL_BINPATH)mod2wav$(BINEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -lm)
 
 $(TOOL_BINPATH)xm2jss$(BINEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS))
 
 $(TOOL_BINPATH)dumpmod$(BINEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS))
 
 
 $(TOOL_BINPATH)ppl$(BINEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm)
 
 $(TOOL_BINPATH)objlink$(BINEXT): $(OBJPATH)objlink.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS))
 
 $(TOOL_BINPATH)fanalyze$(BINEXT): $(OBJPATH)fanalyze.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS))
 
 $(TOOL_BINPATH)gfxconv$(BINEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o \
 	$(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS))
 
 $(TOOL_BINPATH)64vw$(BINEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o \
 	$(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS))
 
 
 ###
@@ -523,7 +523,7 @@
 ###
 ifneq ($(DEMO_BIN),)
 $(BINPATH)$(DEMO_BIN)$(BINEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
-	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm
+	$(call LINK_C_BIN, $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm)
 endif