wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 909432 - Unify RESFILES and RES_FILES, and rename both to ANDROID_RESFILES. r=gps

Browse Source
This commit is contained in:
Nick Alexander 2013-09-23 09:02:08 -07:00
parent 1d1b11cd65
commit e509ad8b1c
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/mobile/robocop/Makefile.in
View File

@ -14,7 +14,7 @@ JAVAFILES = \
R.java \
$(NULL)
RES_FILES = \
ANDROID_RESFILES = \
res/values/strings.xml \
$(NULL)

2
build/mobile/sutagent/android/Makefile.in
View File

@ -21,7 +21,7 @@ JAVAFILES = \
R.java \
$(NULL)
RES_FILES = \
ANDROID_RESFILES = \
res/drawable/icon.png \
res/drawable/ateamlogo.png \
res/drawable/ic_stat_first.png \

2
build/mobile/sutagent/android/fencp/Makefile.in
View File

@ -12,7 +12,7 @@ JAVAFILES = \
R.java \
$(NULL)
RES_FILES = \
ANDROID_RESFILES = \
res/drawable-hdpi/icon.png \
res/drawable-ldpi/icon.png \
res/drawable-mdpi/icon.png \

2
build/mobile/sutagent/android/ffxcp/Makefile.in
View File

@ -12,7 +12,7 @@ JAVAFILES = \
R.java \
$(NULL)
RES_FILES = \
ANDROID_RESFILES = \
res/drawable-hdpi/icon.png \
res/drawable-ldpi/icon.png \
res/drawable-mdpi/icon.png \

2
build/mobile/sutagent/android/watcher/Makefile.in
View File

@ -13,7 +13,7 @@ JAVAFILES = \
WatcherService.java \
$(NULL)
RES_FILES = \
ANDROID_RESFILES = \
res/drawable-hdpi/icon.png \
res/drawable-hdpi/ateamlogo.png \
res/drawable-ldpi/icon.png \

4
config/makefiles/java-build.mk
View File

@ -7,7 +7,7 @@
ifndef INCLUDED_JAVA_BUILD_MK #{
ifdef RES_FILES #{
ifdef ANDROID_RESFILES #{
res-dep := .deps-copy-java-res
GENERATED_DIRS += res
@ -16,7 +16,7 @@ GARBAGE += $(res-dep)
export:: $(res-dep)
res-dep-preqs := \
$(addprefix $(srcdir)/,$(RES_FILES)) \
$(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
$(call mkdir_deps,res) \
$(if $(IS_LANGUAGE_REPACK),FORCE) \
$(NULL)

2
config/rules.mk
View File

@ -1225,7 +1225,7 @@ endif
###############################################################################
# Java rules
###############################################################################
ifneq (,$(value JAVAFILES)$(value RESFILES))
ifneq (,$(value JAVAFILES)$(value ANDROID_RESFILES))
include $(topsrcdir)/config/makefiles/java-build.mk
endif

4
js/src/config/makefiles/java-build.mk
View File

@ -7,7 +7,7 @@
ifndef INCLUDED_JAVA_BUILD_MK #{
ifdef RES_FILES #{
ifdef ANDROID_RESFILES #{
res-dep := .deps-copy-java-res
GENERATED_DIRS += res
@ -16,7 +16,7 @@ GARBAGE += $(res-dep)
export:: $(res-dep)
res-dep-preqs := \
$(addprefix $(srcdir)/,$(RES_FILES)) \
$(addprefix $(srcdir)/,$(ANDROID_RESFILES)) \
$(call mkdir_deps,res) \
$(if $(IS_LANGUAGE_REPACK),FORCE) \
$(NULL)

2
js/src/config/rules.mk
View File

@ -1225,7 +1225,7 @@ endif
###############################################################################
# Java rules
###############################################################################
ifneq (,$(value JAVAFILES)$(value RESFILES))
ifneq (,$(value JAVAFILES)$(value ANDROID_RESFILES))
include $(topsrcdir)/config/makefiles/java-build.mk
endif