From: Jordan <jordanlavatai@gmail.com>
Date: Sat, 17 Dec 2016 23:38:16 +0000 (-0800)
Subject: Merge branch 'master' of krull:apc
X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=commitdiff_plain;h=5ef654acc4a4cdcfb2d3f5f3478ec01dbf6be55b;hp=64c920f6a06c91cb684fc032ec6bf484240a89ed

Merge branch 'master' of krull:apc
---

diff --git a/Makefile b/Makefile
index 079c4cc..c1c8ad7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 # This makefile builds APC, the Asset Package Compiler for Henge, on the system.
 ################################################################################
 # Driver sources
-DRIVERS  := apc testapc
+DRIVERS ?= apc testapc
 
 # Yacc
 YACC   := bison
@@ -30,48 +30,54 @@ LDFLAGS   ?=
 LDLIBS    ?= -lunistring
 apcLIBS   ?= 
 apc-dLIBS ?= 
-LDCMD      = $(strip gcc $(LDFLAGS) $(if $2,-o $2) $1) $(LDLIBS) $($1LIBS) 
+LDCMD      = $(strip $(CC) $(LDFLAGS) $(if $2,-o $2) $1) $(LDLIBS) $($1LIBS) 
 
 # APC is built from Ragel, Bison and C source code only.
-ySRC  := $(shell find ./src -type f -name '*.y')
-rlSRC := $(shell find ./src -type f -name '*.rl')
-cSRC  := $(shell find ./src -type f -name '*.c')
+ySRC  := $(shell find src/ -type f -name '*.y')
+rlSRC := $(shell find src/ -type f -name '*.rl')
+cSRC  := $(shell find src/ -type f -name '*.c')
 
 # Generated files from Yacc/Bison and Ragel
 hGEN  := $(ySRC:%.y=%.tab.h)
 cGEN  := $(strip $(ySRC:%.y=%.tab.c) $(rlSRC:%.rl=%.fsm.c))
+.SECONDARY: $(cGEN)
 
-# Filter all other driver objects out of each driver's link commands.
-OBJ   := $(patsubst %.c,%.o,$(cSRC) $(cGEN))
-$(foreach drv,$(DRIVERS),\
-$(eval OTHERS      := $(filter-out $(drv),$(DRIVERS)))\
-$(eval $(drv)SRC   := $(filter-out $(OTHERS:%=\%/%.o),$(OBJ)))\
-$(eval $(drv)-dSRC := $($(drv)SRC:%.o=%-d.o)))
+# Determine binary/ir targets (object files and driver binaries)
+cTRG  := $(patsubst %.c,%.o,$(cSRC) $(cGEN))
+ldSRC := $(filter-out $(DRIVERS:%=\%/%.o),$(cTRG))
+cTRG  += $(cTRG:%.o=%-d.o)
+ldTRG := $(DRIVERS:%=%-d) $(DRIVERS)
+ldDEP  = $(filter %/$1.o,$(cTRG)) $(if $(filter %-d,$1),$(ldSRC:%.o=%-d.o),$(ldSRC))
+
+# Determine if '1' is newer than '2'
+TSTAMP = $(if $(wildcard $1),$(shell stat -c %Y $1),0$(info nots: $1))
+NEWER  = $(eval 4 := $(call TSTAMP,$(dir $2)$1))
+NEWER += $(eval 5 := $(call TSTAMP,$2))
+NEWER += $(if $(filter $5,$(firstword $(sort $4 $5))),$1,$2)
 
 ifeq (,$(filter clean,$(MAKECMDGOALS)))
 # Deps should be generated for each source file, when not cleaning
 cGENDEP = $(if $(wildcard $1),$(subst $(dir $1),,$(filter-out $1 \ %:,$(shell $(CC) -MM -MG $1))),\
 $(info [<$1>: no deps - file not found]))
 # S2S will print the command necessary to create a file when called
-S2S  = $(info $(call $1,$2,$3))
+S2S  = $(if $(filter $2,$(call NEWER,$2,$3)),$(eval 4 := t),$(eval 4 :=))
+S2S += $(if $4,$(info $(call $1,$2,$3)))
 ifeq (,$(filter n,$(MAKEFLAGS)))
 # Unless we're in -n mode, S2S should also invoke the command on the shell
-S2S += $(shell $(call $1,$2,$3))
+S2S += $(if $4,$(shell $(call $1,$2,$3)))
 endif
 endif
 
+# Clean targets
+cleanCMD = $(if $(wildcard $1),rm $(wildcard $(sort $1)))
+
 # Rules
 .SECONDEXPANSION:
-$(DRIVERS:%=%-d) $(DRIVERS): $$($$@SRC) | $(hGEN)
-	$(strip $(call LDCMD,$^,$@))
-
+$(ldTRG): $$(call ldDEP,$$@) | $(hGEN) ; $(call LDCMD,$^,$@)
 %-d.o: CFLAGS+= -Og -ggdb
-%.o %-d.o: %.c $$(call cGENDEP,$$(dir $$@)%.c)
-	$(call CCMD,$<,$@)
-
+%.o %-d.o: %.c $$(call cGENDEP,$$(dir $$@)%.c) ; $(call CCMD,$<,$@)
 %.tab.h: %.tab.c ;
 %.tab.c: %.y $$(call S2S,YCMD,%.y,$$@) ;
 %.fsm.c: %.rl $$(call S2S,RLCMD,%.rl,$$@) ;
-
-clean: $(wildcard $(cGEN) $(hGEN) $(foreach drv,$(DRIVERS),$($(drv)SRC) $($(drv)-dSRC)))
-	$(if $^,rm $^)
+clean: ; $(call cleanCMD,$(cGEN) $(hGEN) $(cTRG))
+distclean: clean ; $(call cleanCMD,$(ldTRG))