These no longer need to be separate variables

This commit is contained in:
JT 2013-01-26 14:33:09 +00:00
parent 3c10e179c2
commit 62f2170ef2

View File

@ -50,10 +50,7 @@ $(call copy_file,$4,$2)
# shiny iso # shiny iso
$(call copy_file,$5,$3) $(call copy_file,$5,$3)
FLAG_FLAT_FILES += $2 FLAG_FILES += $2 $3 $4 $5
FLAG_SHINY_FILES += $3
FLAG_ISO_FLAT_FILES += $4
FLAG_ISO_SHINY_FILES += $5
endef endef
@ -82,10 +79,11 @@ endif
# shiny iso # shiny iso
$(call copy_file,$2/shiny/$5/$4.$5,$1/shiny/$5/$3.$5) $(call copy_file,$2/shiny/$5/$4.$5,$1/shiny/$5/$3.$5)
FLAG_FLAT_FILES += $1/flat/$5/$3.$5 FLAG_FILES += \
FLAG_ISO_FLAT_FILES += $2/flat/$5/$4.$5 $1/flat/$5/$3.$5 \
FLAG_SHINY_FILES += $1/shiny/$5/$3.$5 $2/flat/$5/$4.$5 \
FLAG_ISO_SHINY_FILES += $2/shiny/$5/$4.$5 $1/shiny/$5/$3.$5 \
$2/shiny/$5/$4.$5
endef endef
define define_flag define define_flag
@ -119,10 +117,7 @@ $(foreach flag,${NEPAL}, \
$(eval $(call define_flag,$(flag),$(shell cat "${INDIR}/$(flag)/code"),nepal))) $(eval $(call define_flag,$(flag),$(shell cat "${INDIR}/$(flag)/code"),nepal)))
ZIPFILES = \ ZIPFILES = \
${FLAG_FLAT_FILES} \ ${FLAG_FILES} \
${FLAG_SHINY_FILES} \
${FLAG_ISO_FLAT_FILES} \
${FLAG_ISO_SHINY_FILES} \
${OUTDIR}/LICENSE.txt \ ${OUTDIR}/LICENSE.txt \
${OUTDIR}/Hello.txt ${OUTDIR}/Hello.txt