diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:57:20 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:57:20 +0200 |
commit | d5f4391187f8d1e93b313e8145ad81966308c913 (patch) | |
tree | 144689b07573529c1264b1b360e382eb9f51e349 /tools | |
parent | 045c69c51d541c90f133abcb94f32f9323ed8c6e (diff) | |
download | rockbox-d5f4391187f8d1e93b313e8145ad81966308c913.tar.gz rockbox-d5f4391187f8d1e93b313e8145ad81966308c913.zip |
Partly undo 54e00c1: put include back to root.make and use SECONDEXPANSION.
Change-Id: If38507ed896f577ea30e2ddae3bac3f4b98cee59
Diffstat (limited to 'tools')
-rw-r--r-- | tools/checkwps/checkwps.make | 4 | ||||
-rw-r--r-- | tools/root.make | 1 |
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 \ | |||
27 | -I$(APPSDIR) \ | 27 | -I$(APPSDIR) \ |
28 | -I$(BUILDDIR) | 28 | -I$(BUILDDIR) |
29 | 29 | ||
30 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
31 | |||
32 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | 30 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
33 | 31 | ||
34 | $(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS) | 32 | $(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $$(CORE_LIBS) |
35 | @echo LD $(BINARY) | 33 | @echo LD $(BINARY) |
36 | $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \ | 34 | $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \ |
37 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) | 35 | -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))) | |||
92 | include $(APPSDIR)/bootbox.make | 92 | include $(APPSDIR)/bootbox.make |
93 | else ifneq (,$(findstring checkwps,$(APP_TYPE))) | 93 | else ifneq (,$(findstring checkwps,$(APP_TYPE))) |
94 | include $(APPSDIR)/checkwps.make | 94 | include $(APPSDIR)/checkwps.make |
95 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
95 | else ifneq (,$(findstring database,$(APP_TYPE))) | 96 | else ifneq (,$(findstring database,$(APP_TYPE))) |
96 | include $(APPSDIR)/database.make | 97 | include $(APPSDIR)/database.make |
97 | else ifneq (,$(findstring warble,$(APP_TYPE))) | 98 | else ifneq (,$(findstring warble,$(APP_TYPE))) |