From: Oliver Schmidt Date: Thu, 6 Mar 2014 22:42:44 +0000 (+0100) Subject: Moved .PHONY below definitions it refers to. X-Git-Tag: V2.15~115 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1c73fa0a00074a337a88a6af9a2742f805dd1526;p=cc65 Moved .PHONY below definitions it refers to. I must admit that I don't understand why but obviously it is necessary to place .PHONY below the definition of variables it refers to - although those variables are recursively expanded ones! Not doing so made libsrc/Makefile build only three target libraries. --- diff --git a/libsrc/Makefile b/libsrc/Makefile index 24a958972..4cee7838b 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -2,10 +2,6 @@ ifneq ($(shell echo),) CMD_EXE = 1 endif -.PHONY: all mostlyclean clean install lib $(TARGETS) - -.SUFFIXES: - CBMS = c128 \ c16 \ c64 \ @@ -37,6 +33,10 @@ DRVTYPES = emd \ ser \ tgi +.PHONY: all mostlyclean clean install lib $(TARGETS) + +.SUFFIXES: + ifdef CMD_EXE DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir)))) MKDIR = mkdir $(subst /,\,$1) diff --git a/src/Makefile b/src/Makefile index 87548628b..45c8f4363 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,10 +2,6 @@ ifneq ($(shell echo),) CMD_EXE = 1 endif -.PHONY: all mostlyclean clean install avail unavail bin $(PROGS) - -.SUFFIXES: - PROGS = ar65 \ ca65 \ cc65 \ @@ -18,6 +14,10 @@ PROGS = ar65 \ sim65 \ sp65 +.PHONY: all mostlyclean clean install avail unavail bin $(PROGS) + +.SUFFIXES: + bindir := $(prefix)/bin datadir := $(if $(prefix),$(prefix)/share/cc65,$(abspath ..))