Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix problems introduced with WINCE_ONLY definition. Apparently you

Browse source 
can't redifine a makefile var and have the new value used on
subsequent lines.
This commit is contained in:
ehouse 2004-07-11 15:03:03 +00:00
parent 76615fbc48
commit 0539ebd1d9
1 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
dawg/Makefile.langcommon
View file

@ -45,10 +45,11 @@ else
endif
ifeq ($(TARGET_TYPE),WINCE)
TARGET_TYPE = FRANK
WINCE_ONLY = true
endif
.PHONY: checkARCH
##############################################################################
# PalmOS rules
##############################################################################
@ -140,36 +141,17 @@ ifeq ($(TARGET_TYPE),FRANK)
# build the .xwd file.
ifeq (x$(shell echo -n $$EBOOKMAN_SDK)x,xx)
all: $(LANG)2to8.xwd
empty: $(LANG)0to0.xwd
else
all: $(LANG)2to8.seb
endif
all: checkARCH $(LANG)2to8.seb
empty: $(LANG)0to0.seb
ifneq (x$(shell echo -n $$EBOOKMAN_SDK)x,xx)
include ${EBOOKMAN_SDK}/ebsdk.uses
endif
# a binary file (one byte) giving the number of tiles in the dict
charcount.bin: table.bin
ifdef NEWDAWG
siz=$$(wc -c $< | sed -e 's/$<//'); \
perl -e "print pack(\"c\",$$siz/2)" > $@
else
siz=$$(wc -c $< | sed -e 's/$<//'); \
perl -e "print pack(\"c\",$$siz)" > $@
endif
# For each entry in the table whose face < 32, there needs to be a pair of
# pbitm files and a string giving the printing form
frankspecials.bin: ../frank_mkspecials.pl $(BMPFILES)
$< $(BLANK_INFO) $(LANG_SPECIAL_INFO) > $@
$(LANG)%.$(FRANK_EXT): dawg$(LANG)%.stamp $(LANG)%_flags.bin charcount.bin table.bin values.bin frankspecials.bin
cat $(LANG)$*_flags.bin charcount.bin table.bin values.bin \
frankspecials.bin $(LANG)StartLoc.bin \
$$(ls dawg$(LANG)$*_*.bin) > $@
cp $@ saveme.bin
checkARCH:
if [[ $$ARCH == "" ]]; then \
$(error "ARCH must be defined in ENV if TARGET_TYPE==FRANK"); \
fi
ifndef WINCE_ONLY
$(LANG)%.seb: $(LANG)%.$(FRANK_EXT) $(LANG)%.atts
@ -189,10 +171,17 @@ endif
byodbins: table.bin values.bin frankspecials.bin info.txt
else
ifeq ($(TARGET_TYPE),WINCE)
### WINCE section here ###
all: $(LANG)2to8.xwd
else
(Need to define TARGET_TYPE if get error pointing to this line)
endif #ifeq ($(TARGET_TYPE),FRANK)
endif
endif
ifeq (s$(TARGET_TYPE),s)
It's an error not to specify a TARGET_TYPE
@ -202,6 +191,28 @@ endif
# shared rules
##############################################################################
# For each entry in the table whose face < 32, there needs to be a pair of
# pbitm files and a string giving the printing form
frankspecials.bin: ../frank_mkspecials.pl $(BMPFILES)
$< $(BLANK_INFO) $(LANG_SPECIAL_INFO) > $@
# a binary file (one byte) giving the number of tiles in the dict
charcount.bin: table.bin
ifdef NEWDAWG
siz=$$(wc -c $< | sed -e 's/$<//'); \
perl -e "print pack(\"c\",$$siz/2)" > $@
else
siz=$$(wc -c $< | sed -e 's/$<//'); \
perl -e "print pack(\"c\",$$siz)" > $@
endif
$(LANG)%.$(FRANK_EXT): dawg$(LANG)%.stamp $(LANG)%_flags.bin charcount.bin table.bin values.bin frankspecials.bin
cat $(LANG)$*_flags.bin charcount.bin table.bin values.bin \
frankspecials.bin $(LANG)StartLoc.bin \
$$(ls dawg$(LANG)$*_*.bin) > $@
cp $@ saveme.bin
# For some reason I can't fathom dawg$(LANG)% gets nuked every time
# the top-level rule fires (all: for whatever TARGET_TYPE.) It
# happens after the rule finishes....