Partly undo 54e00c1: put include back to root.make and use SECONDEXPANSION.

Change-Id: If38507ed896f577ea30e2ddae3bac3f4b98cee59

2 files changed, 2 insertions, 3 deletions

diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make
index 646b59ef5d..8e183950be 100644
--- a/tools/checkwps/checkwps.make
+++ b/tools/checkwps/checkwps.make
@@ -27,11 +27,9 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(APPSDIR) \
            -I$(BUILDDIR)
 
-include $(ROOTDIR)/lib/skin_parser/skin_parser.make
-
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this
 
-$(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS)
+$(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $$(CORE_LIBS)
         @echo LD $(BINARY)
         $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS)  \
         -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS))
diff --git a/tools/root.make b/tools/root.make
index 4a8d2adf16..032daf5a1c 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -92,6 +92,7 @@ else ifneq (,$(findstring bootbox,$(APPSDIR)))
   include $(APPSDIR)/bootbox.make
 else ifneq (,$(findstring checkwps,$(APP_TYPE)))
   include $(APPSDIR)/checkwps.make
+  include $(ROOTDIR)/lib/skin_parser/skin_parser.make
 else ifneq (,$(findstring database,$(APP_TYPE)))
   include $(APPSDIR)/database.make
 else ifneq (,$(findstring warble,$(APP_TYPE)))