recursion fixes

diff --git a/Makefile b/Makefile
index 8cefc8e..c1c8ad7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,13 +33,14 @@ apc-dLIBS ?=
 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)
 
 # Determine binary/ir targets (object files and driver binaries)
 cTRG  := $(patsubst %.c,%.o,$(cSRC) $(cGEN))
@@ -48,20 +49,27 @@ 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 $1))
+cleanCMD = $(if $(wildcard $1),rm $(wildcard $(sort $1)))
 
 # Rules
 .SECONDEXPANSION: