projects
/
dosdemo
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7d77b7
)
fixed img2bin makefile to use the included libimago
author
John Tsiombikas
<nuclear@member.fsf.org>
Sun, 8 May 2022 19:48:19 +0000
(22:48 +0300)
committer
John Tsiombikas
<nuclear@member.fsf.org>
Sun, 8 May 2022 19:48:19 +0000
(22:48 +0300)
tools/img2bin/Makefile
patch
|
blob
|
history
diff --git
a/tools/img2bin/Makefile
b/tools/img2bin/Makefile
index
5e525cb
..
0763597
100644
(file)
--- 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)