From: John Tsiombikas Date: Sun, 8 May 2022 19:48:19 +0000 (+0300) Subject: fixed img2bin makefile to use the included libimago X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=e6f223c23a235aff13014fb0f9fa902d5b7cf87f fixed img2bin makefile to use the included libimago --- diff --git a/tools/img2bin/Makefile b/tools/img2bin/Makefile index 5e525cb..0763597 100644 --- a/tools/img2bin/Makefile +++ b/tools/img2bin/Makefile @@ -3,12 +3,18 @@ bin = img2bin root = ../.. -CFLAGS = -pedantic -Wall -g -I$(root)/libs/imago/src -LDFLAGS = -L$(root)/libs/imago -limago -lpng -ljpeg -lz -L/usr/local/lib -lm +imagodir = $(root)/libs/imago +libimago = $(imagodir)/libimago.a -$(bin): $(obj) +CFLAGS = -pedantic -Wall -g -I$(imagodir)/src +LDFLAGS = -L$(imagodir) -limago -lm + +$(bin): $(obj) $(libimago) $(CC) -o $@ $(obj) $(LDFLAGS) +$(libimago): + $(MAKE) -C $(imagodir) + .PHONY: clean clean: rm -f $(obj) $(bin)