Mercurial > hg > dmlib

comparison Makefile.gen @ 2348:2d8fee642543

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve build system: only hard depend on fontconv and data2inc when we are building with tools to begin with.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 29 Oct 2019 14:36:13 +0200
parents 71d94f965725
children 463e5d9771ee
comparison
equal deleted inserted replaced
2347:32893335efc0 2348:2d8fee642543
260 ### What tests to build? 260 ### What tests to build?
261 ifeq ($(DM_BUILD_TESTS),yes) 261 ifeq ($(DM_BUILD_TESTS),yes)
262 TESTS_BINARIES += vecmattest fptest dzlibtest encbr1test 262 TESTS_BINARIES += vecmattest fptest dzlibtest encbr1test
263 endif 263 endif
264 264
265 FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT)
266 DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT)
267
265 ifeq ($(EXEEXT),.exe) 268 ifeq ($(EXEEXT),.exe)
266 # Cross-building Windows binaries requires locally installed utilities 269 # Cross-building Windows binaries requires locally installed utilities
267 FONTCONV_BIN=fontconv
268 FONTCONV_DEP= 270 FONTCONV_DEP=
269 DATA2INC_BIN=data2inc
270 DATA2INC_DEP= 271 DATA2INC_DEP=
271 else 272 else
272 FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) 273 ifeq ($(DM_BUILD_TOOLS),yes)
273 FONTCONV_DEP=$(FONTCONV_BIN) 274 FONTCONV_DEP=$(FONTCONV_BIN)
274 DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT)
275 DATA2INC_DEP=$(DATA2INC_BIN) 275 DATA2INC_DEP=$(DATA2INC_BIN)
276 endif
276 endif 277 endif
277 278
278 279
279 ### 280 ###
280 ### Rest of the rules 281 ### Rest of the rules