minor variable management usage

[henge/apc.git] / Makefile

diff --git a/Makefile b/Makefile
index e10f81c..2d928e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ LDFLAGS   ?=
 LDLIBS    ?= -lunistring
 apcLIBS   ?= 
 apc-dLIBS ?= 
-LDCMD      = $(strip $(LD) $(LDFLAGS) $(LDLIBS) $($1LIBS) $(if $2,-o $2) $1)
+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')
@@ -39,30 +39,31 @@ 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=%.c))
+cGEN  := $(strip $(ySRC:%.y=%.tab.c) $(rlSRC:%.rl=%.fsm.c))
 
 # Filter all other driver objects out of each driver's link commands.
+OBJ   := $(patsubst %.c,%.o,$(cSRC) $(cGEN))
 $(foreach drv,$(DRIVERS),\
-$(eval $(drv)SRC   := $(patsubst %.c,%.o,$(filter-out $(patsubst %,src/%.c,$(filter-out $(drv),$(DRIVERS))),$(cSRC) $(cGEN))))\
-$(eval $(drv)-dSRC := $(patsubst %.o,%-d.o,$($(drv)SRC))))
+$(eval OTHERS      := $(filter-out $(drv),$(DRIVERS)))\
+$(eval $(drv)SRC   := $(filter-out $(OTHERS:%=\%/%.o),$(OBJ)))\
+$(eval $(drv)-dSRC := $($(drv)SRC:%.o=%-d.o)))
 
-# Unless cleaning, deps should be generated for each source file
 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))
+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))
+endif
 endif
-
-# Construct the S2S function for generating source files during prerequisite
-# expansion:
-# If we are cleaning, stop.  Else print the result of calling '1'.  Then, unless
-# we are in -n mode, invoke the result of calling '1' in the shell
-$(if $(filter clean,$(MAKECMDGOALS)),,$(eval S2S += $$(info $$(call $$1,$$2,$$3)))\
-$(if $(filter n,$(MAKEFLAGS)),,$(eval S2S += $$(shell $$(call $$1,$$2,$$3)))))
 
 # Rules
 .SECONDEXPANSION:
 $(DRIVERS:%=%-d) $(DRIVERS): $$($$@SRC) | $(hGEN)
-       $(strip $(call LDCMD,$^,$@))
+       $(call LDCMD,$^,$@)
 
 %-d.o: CFLAGS+= -Og -ggdb
 %.o %-d.o: %.c $$(call cGENDEP,$$(dir $$@)%.c)
@@ -70,7 +71,7 @@ $(DRIVERS:%=%-d) $(DRIVERS): $$($$@SRC) | $(hGEN)
 
 %.tab.h: %.tab.c ;
 %.tab.c: %.y $$(call S2S,YCMD,%.y,$$@) ;
-%.c: %.rl $$(call S2S,RLCMD,%.rl,$$@) ;
+%.fsm.c: %.rl $$(call S2S,RLCMD,%.rl,$$@) ;
 
-clean: $(wildcard $(cGEN) $(hGEN) $(apcSRC) $(apc-dSRC))
+clean: $(wildcard $(cGEN) $(hGEN) $(foreach drv,$(DRIVERS),$($(drv)SRC) $($(drv)-dSRC)))
        $(if $^,rm $^)