devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
Change-Id: If38507ed896f577ea30e2ddae3bac3f4b98cee59
This commit is contained in:
Thomas Martitz 2012-03-26 23:57:20 +02:00
parent 045c69c51d
commit d5f4391187
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/checkwps/checkwps.make
View file

@ -27,11 +27,9 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
-I$(APPSDIR) \ -I$(APPSDIR) \
-I$(BUILDDIR) -I$(BUILDDIR)
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
.SECONDEXPANSION: # $$(OBJ) is not populated until after this .SECONDEXPANSION: # $$(OBJ) is not populated until after this
$(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS) $(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $$(CORE_LIBS)
@echo LD $(BINARY) @echo LD $(BINARY)
$(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \ $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \
-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS))

1
tools/root.make
View file

@ -92,6 +92,7 @@ else ifneq (,$(findstring bootbox,$(APPSDIR)))
include $(APPSDIR)/bootbox.make include $(APPSDIR)/bootbox.make
else ifneq (,$(findstring checkwps,$(APP_TYPE))) else ifneq (,$(findstring checkwps,$(APP_TYPE)))
include $(APPSDIR)/checkwps.make include $(APPSDIR)/checkwps.make
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
else ifneq (,$(findstring database,$(APP_TYPE))) else ifneq (,$(findstring database,$(APP_TYPE)))
include $(APPSDIR)/database.make include $(APPSDIR)/database.make
else ifneq (,$(findstring warble,$(APP_TYPE))) else ifneq (,$(findstring warble,$(APP_TYPE)))