Mercurial > hg > dmlib

comparison Makefile.gen @ 2356:d3d7fce567d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some work on build system improvements/cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 16:48:46 +0200
parents 463e5d9771ee
children 21d8eb203e2a
comparison
equal deleted inserted replaced
2355:b436ecd76fa0 2356:d3d7fce567d9
22 DMLIB_SRC = $(DMLIB)src/ 22 DMLIB_SRC = $(DMLIB)src/
23 23
24 DM_CFLAGS += -I$(DMLIB_SRC) 24 DM_CFLAGS += -I$(DMLIB_SRC)
25 25
26 ifeq ($(EXTRA_CFLAGS),) 26 ifeq ($(EXTRA_CFLAGS),)
27 EXTRA_CFLAGS=-O3 27 EXTRA_CFLAGS=-O3 -flto
28 # -march=corei7 28 # -march=corei7
29 endif 29 endif
30 30
31 31
32 ### 32 ###
289 DM_CFLAGS += $(SDL_CFLAGS) 289 DM_CFLAGS += $(SDL_CFLAGS)
290 DM_LDFLAGS += $(LDFLAGS) 290 DM_LDFLAGS += $(LDFLAGS)
291 291
292 292
293 ifneq ($(V),1) 293 ifneq ($(V),1)
294 COMPILE_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo " CC $<" && $(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 294 COMPILE_C_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo " CC $<" && $(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
295 LINK_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo " LINK $@" && $(CC) -o $@ $(filter %.o %.a,$+) 295 COMPILE_CXX_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo " CXX $<" && $(CXX) $(CXXFLAGS) -c -o $@ $< $(DM_CFLAGS)
296 LINK_C_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo " LINK $@" && $(CC) -o $@ $(filter %.o %.a,$+)
297 LINK_CXX_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo " LINK $@" && $(CXX) -o $@ $(filter %.o %.a,$+)
296 LINK_STATIC_LIB = @echo " AR $@" && $(AR) cru $@ $(filter %.o,$+) && $(RANLIB) $@ 298 LINK_STATIC_LIB = @echo " AR $@" && $(AR) cru $@ $(filter %.o,$+) && $(RANLIB) $@
297 else 299 else
298 COMPILE_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo "$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)" && $(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 300 COMPILE_C_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo "$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)" && $(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
299 LINK_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo "$(CC) -o $@ $(filter %.o %.a,$+)" && $(CC) -o $@ $(filter %.o %.a,$+) 301 COMPILE_CXX_OBJ = @if test ! -d $(OBJPATH); then $(MKDIR_P) $(OBJPATH); fi && echo "$(CXX) $(CXXFLAGS) -c -o $@ $< $(DM_CFLAGS)" && $(CXX) $(CXXFLAGS) -c -o $@ $< $(DM_CFLAGS)
302 LINK_C_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo "$(CC) -o $@ $(filter %.o %.a,$+)" && $(CC) -o $@ $(filter %.o %.a,$+)
303 LINK_CXX_BIN = @if test ! -d $(BINPATH); then $(MKDIR_P) $(BINPATH); fi && echo "$(CXX) -o $@ $(filter %.o %.a,$+)" && $(CXX) -o $@ $(filter %.o %.a,$+)
300 LINK_STATIC_LIB = @echo "$(AR) cru $@ $(filter %.o,$+)" && $(AR) cru $@ $(filter %.o,$+) && echo "$(RANLIB) $@" && $(RANLIB) $@ 304 LINK_STATIC_LIB = @echo "$(AR) cru $@ $(filter %.o,$+)" && $(AR) cru $@ $(filter %.o,$+) && echo "$(RANLIB) $@" && $(RANLIB) $@
301 endif 305 endif
302 306
303 307
304 DMLIB_A=$(OBJPATH)dmlib.a 308 DMLIB_A=$(OBJPATH)dmlib.a
311 TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES))) 315 TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
312 TOOL_TARGETS = $(addprefix $(TOOL_BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES))) 316 TOOL_TARGETS = $(addprefix $(TOOL_BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
313 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \ 317 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
314 $(TOOL_TARGETS) $(TESTS_TARGETS) 318 $(TOOL_TARGETS) $(TESTS_TARGETS)
315 319
316 #NONBUILD += 320 NOBUILD_TARGETS +=
317 321 NOINST_TARGETS +=
318 322
319 all: $(NONBUILD) $(TARGETS) 323
324 all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
320 325
321 326
322 ### 327 ###
323 ### Generic object rules 328 ### Generic object rules
324 ### 329 ###
325 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h 330 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
326 $(COMPILE_OBJ) 331 $(COMPILE_C_OBJ)
327 332
328 $(OBJPATH)%.o: $(DMLIB)tests/%.c 333 $(OBJPATH)%.o: $(DMLIB)tests/%.c
329 $(COMPILE_OBJ) 334 $(COMPILE_C_OBJ)
330 335
331 $(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h 336 $(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h
332 $(COMPILE_OBJ) 337 $(COMPILE_C_OBJ)
333 338
334 $(OBJPATH)%.o: $(DMLIB)tools/%.c 339 $(OBJPATH)%.o: $(DMLIB)tools/%.c
335 $(COMPILE_OBJ) 340 $(COMPILE_C_OBJ)
336 341
337 $(OBJPATH)%.o: %.c %.h 342 $(OBJPATH)%.o: %.c %.h
338 $(COMPILE_OBJ) 343 $(COMPILE_C_OBJ)
339 344
340 $(OBJPATH)%.o: %.c 345 $(OBJPATH)%.o: %.c
341 $(COMPILE_OBJ) 346 $(COMPILE_C_OBJ)
342 347
343 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h 348 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
344 $(COMPILE_OBJ) 349 $(COMPILE_C_OBJ)
345 350
346 $(OBJPATH)%.o: $(MINIJSS)%.c 351 $(OBJPATH)%.o: $(MINIJSS)%.c
347 $(COMPILE_OBJ) 352 $(COMPILE_C_OBJ)
348 353
349 $(OBJPATH)%.o: $(DMLIB_SRC)%.c $(DMLIB_SRC)%.h 354 $(OBJPATH)%.o: $(DMLIB_SRC)%.c $(DMLIB_SRC)%.h
350 $(COMPILE_OBJ) 355 $(COMPILE_C_OBJ)
351 356
352 $(OBJPATH)%.o: $(DMLIB_SRC)%.c 357 $(OBJPATH)%.o: $(DMLIB_SRC)%.c
353 $(COMPILE_OBJ) 358 $(COMPILE_C_OBJ)
354 359
355 360
356 ### 361 ###
357 ### dmlib-specific rules 362 ### dmlib-specific rules
358 ### 363 ###
359 $(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h 364 $(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h
360 (echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@ 365 (echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
361 366
362 $(OBJPATH)dmimage.o: $(DMLIB_SRC)dmimage.c $(DMLIB_SRC)stb_image.c $(DMLIB_SRC)dmimage.h 367 $(OBJPATH)dmimage.o: $(DMLIB_SRC)dmimage.c $(DMLIB_SRC)stb_image.c $(DMLIB_SRC)dmimage.h
363 $(COMPILE_OBJ) 368 $(COMPILE_C_OBJ)
364 369
365 $(OBJPATH)dmresw.o: $(DMLIB_SRC)dmresw.c $(DMLIB_SRC)dmres.h 370 $(OBJPATH)dmresw.o: $(DMLIB_SRC)dmresw.c $(DMLIB_SRC)dmres.h
366 $(COMPILE_OBJ) 371 $(COMPILE_C_OBJ)
367 372
368 373
369 $(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(OBJPATH)jss.o 374 $(OBJPATH)jssmod.o: $(MINIJSS)jssmod.c $(MINIJSS)jssmod.h $(OBJPATH)jss.o
370 $(COMPILE_OBJ) 375 $(COMPILE_C_OBJ)
371 376
372 $(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(OBJPATH)jssmod.o 377 $(OBJPATH)jssmix.o: $(MINIJSS)jssmix.c $(MINIJSS)jssmix.h $(OBJPATH)jssmod.o
373 $(COMPILE_OBJ) 378 $(COMPILE_C_OBJ)
374 379
375 $(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(OBJPATH)jssmix.o 380 $(OBJPATH)jssplr.o: $(MINIJSS)jssplr.c $(MINIJSS)jssplr.h $(OBJPATH)jssmix.o
376 $(COMPILE_OBJ) 381 $(COMPILE_C_OBJ)
377 382
378 383
379 $(OBJPATH)dmblit.o: $(DMLIB_SRC)dmblit.c $(DMLIB_SRC)dmscaledblit.h $(DMLIB_SRC)dmunscaledblit.h $(DMLIB_SRC)dmblitfunc.h $(DMLIB_SRC)dmlib.h 384 $(OBJPATH)dmblit.o: $(DMLIB_SRC)dmblit.c $(DMLIB_SRC)dmscaledblit.h $(DMLIB_SRC)dmunscaledblit.h $(DMLIB_SRC)dmblitfunc.h $(DMLIB_SRC)dmlib.h
380 $(COMPILE_OBJ) 385 $(COMPILE_C_OBJ)
381 386
382 $(OBJPATH)dmline.o: $(DMLIB_SRC)dmline.c $(DMLIB_SRC)dmdrawline.h $(DMLIB_SRC)dmlinefunc.h $(DMLIB_SRC)dmlineclip.h $(DMLIB_SRC)dmlib.h 387 $(OBJPATH)dmline.o: $(DMLIB_SRC)dmline.c $(DMLIB_SRC)dmdrawline.h $(DMLIB_SRC)dmlinefunc.h $(DMLIB_SRC)dmlineclip.h $(DMLIB_SRC)dmlib.h
383 $(COMPILE_OBJ) 388 $(COMPILE_C_OBJ)
384 389
385 $(OBJPATH)libgfx.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h $(DMLIB_A) 390 $(OBJPATH)libgfx.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h $(DMLIB_A)
386 $(COMPILE_OBJ) 391 $(COMPILE_C_OBJ)
387 392
388 $(OBJPATH)lib64gfx.o: $(DMLIB)tools/lib64gfx.c $(DMLIB)tools/lib64gfx.h $(OBJPATH)libgfx.o 393 $(OBJPATH)lib64gfx.o: $(DMLIB)tools/lib64gfx.c $(DMLIB)tools/lib64gfx.h $(OBJPATH)libgfx.o
389 $(COMPILE_OBJ) 394 $(COMPILE_C_OBJ)
390 395
391 $(OBJPATH)lib64util.o: $(DMLIB)tools/lib64util.c $(DMLIB)tools/lib64util.h $(OBJPATH)lib64gfx.o 396 $(OBJPATH)lib64util.o: $(DMLIB)tools/lib64util.c $(DMLIB)tools/lib64util.h $(OBJPATH)lib64gfx.o
392 $(COMPILE_OBJ) 397 $(COMPILE_C_OBJ)
393 398
394 $(OBJPATH)lib64fmts.o: $(DMLIB)tools/lib64fmts.c $(OBJPATH)lib64gfx.o 399 $(OBJPATH)lib64fmts.o: $(DMLIB)tools/lib64fmts.c $(OBJPATH)lib64gfx.o
395 $(COMPILE_OBJ) 400 $(COMPILE_C_OBJ)
396 401
397 $(OBJPATH)64vw.o: $(DMLIB)tools/64vw.c $(OBJPATH)lib64util.o 402 $(OBJPATH)64vw.o: $(DMLIB)tools/64vw.c $(OBJPATH)lib64util.o
398 $(COMPILE_OBJ) 403 $(COMPILE_C_OBJ)
399 404
400 $(OBJPATH)gfxconv.o: $(DMLIB)tools/gfxconv.c $(OBJPATH)lib64util.o 405 $(OBJPATH)gfxconv.o: $(DMLIB)tools/gfxconv.c $(OBJPATH)lib64util.o
401 $(COMPILE_OBJ) 406 $(COMPILE_C_OBJ)
402 407
403 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \ 408 $(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(DMLIB_SRC)setupfont.h \
404 $(OBJPATH)libgutil.o $(DMLIB_A) 409 $(OBJPATH)libgutil.o $(DMLIB_A)
405 $(COMPILE_OBJ) 410 $(COMPILE_C_OBJ)
406 411
407 412
408 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP) 413 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_DEP)
409 @echo " FONT $@ $<" 414 @echo " FONT $@ $<"
410 @$(FONTCONV_BIN) $< $@ 415 @$(FONTCONV_BIN) $< $@
422 @$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null 427 @$(DATA2INC_BIN) -q -f c -n engineSetupMenuBar -t Uint8 $< $@ > /dev/null
423 428
424 429
425 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \ 430 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
426 setupmenubar.h setupfont.h setupimage.h dmsimple.c) 431 setupmenubar.h setupfont.h setupimage.h dmsimple.c)
427 $(COMPILE_OBJ) 432 $(COMPILE_C_OBJ)
428 433
429 434
430 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak 435 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak
431 $(LINK_STATIC_LIB) 436 $(LINK_STATIC_LIB)
432 437
433 438
434 ### 439 ###
435 ### Tests 440 ### Tests
436 ### 441 ###
437 $(TESTS_BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A) 442 $(TESTS_BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
438 $(LINK_BIN) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm 443 $(LINK_C_BIN) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
439 444
440 $(TESTS_BINPATH)dzlibtest$(EXEEXT): $(OBJPATH)dzlibtest.o $(DMLIB_A) 445 $(TESTS_BINPATH)dzlibtest$(EXEEXT): $(OBJPATH)dzlibtest.o $(DMLIB_A)
441 $(LINK_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) 446 $(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS)
442 447
443 $(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A) 448 $(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
444 $(LINK_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) -lm 449 $(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
445 450
446 $(TESTS_BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A) 451 $(TESTS_BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
447 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm 452 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm
448 453
449 454
450 ### 455 ###
451 ### Tools 456 ### Tools
452 ### 457 ###
453 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A) 458 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
454 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(ZLIB_LDFLAGS) -lm 459 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(ZLIB_LDFLAGS) -lm
455 460
456 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A) 461 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
457 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) 462 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
458 463
459 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A) 464 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
460 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) 465 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
461 466
462 $(TOOL_BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A) 467 $(TOOL_BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
463 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -lm 468 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
464 469
465 $(TOOL_BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A) 470 $(TOOL_BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
466 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) 471 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
467 472
468 $(TOOL_BINPATH)dumpmod$(EXEEXT): $(OBJPATH)dumpmod.o $(DMLIB_A) 473 $(TOOL_BINPATH)dumpmod$(EXEEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
469 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) 474 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
470 475
471 476
472 $(TOOL_BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A) 477 $(TOOL_BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A)
473 $(LINK_BIN) $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm 478 $(LINK_C_BIN) $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm
474 479
475 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A) 480 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
476 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) 481 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
477 482
478 $(TOOL_BINPATH)fanalyze$(EXEEXT): $(OBJPATH)fanalyze.o $(DMLIB_A) 483 $(TOOL_BINPATH)fanalyze$(EXEEXT): $(OBJPATH)fanalyze.o $(DMLIB_A)
479 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) 484 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
480 485
481 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o \ 486 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o \
482 $(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A) 487 $(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
483 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) 488 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
484 489
485 $(TOOL_BINPATH)64vw$(EXEEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o \ 490 $(TOOL_BINPATH)64vw$(EXEEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o \
486 $(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A) 491 $(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
487 $(LINK_BIN) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) 492 $(LINK_C_BIN) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)
488 493
489 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A) 494 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
490 $(LINK_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm 495 $(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm
491 496
492 497
493 ### 498 ###
494 ### Demo binary 499 ### Demo binary
495 ### 500 ###
496 ifneq ($(DEMO_BIN),) 501 ifneq ($(DEMO_BIN),)
497 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) 502 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
498 $(LINK_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm 503 $(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm
499 endif 504 endif
500 505
501 506
502 ### 507 ###
503 ### Editor targets 508 ### Editor targets
528 533
529 ### 534 ###
530 ### Special targets 535 ### Special targets
531 ### 536 ###
532 clean: 537 clean:
533 -$(RM) $(TARGETS) $(TMPFILES) $(OBJPATH)*.o 538 -$(RM) $(TARGETS) $(NOINST_TARGETS) $(CLEAN_TARGETS) $(OBJPATH)*.o
534 539
540 distclean: clean
541 -$(RM) $(DISTCLEAN_TARGETS) *~ core *.core
542
543 .PHONY: clean distclean all