From 2cc46d8a69bca610dd25671e007c61cad14584a8 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 17 Dec 2010 19:02:01 -0800 Subject: [PATCH] get rid of unused but oft-included file --- xwords4/dawg/Arabic/Makefile | 2 -- xwords4/dawg/Catalan/Makefile | 2 -- xwords4/dawg/Czech/Makefile | 2 -- xwords4/dawg/Danish/Makefile | 2 -- xwords4/dawg/Dutch/Makefile | 2 -- xwords4/dawg/English/Makefile.BasEnglish | 2 -- xwords4/dawg/English/Makefile.CSW | 2 -- xwords4/dawg/English/Makefile.CollegeEng | 2 -- xwords4/dawg/English/Makefile.Enable | 2 -- xwords4/dawg/English/Makefile.OWL2 | 2 -- xwords4/dawg/English/Makefile.SOWPODS | 2 -- xwords4/dawg/English/Makefile.TWL06 | 2 -- xwords4/dawg/French/Makefile | 2 -- xwords4/dawg/French/Makefile.ODS4 | 2 -- xwords4/dawg/French/Makefile.ODS5 | 2 -- xwords4/dawg/German/Makefile | 2 -- xwords4/dawg/Greek/Makefile | 2 -- xwords4/dawg/Hex/Makefile | 2 -- xwords4/dawg/Hëx/Makefile | 2 -- xwords4/dawg/Italian/Makefile | 2 -- xwords4/dawg/Makefile.2to8 | 7 ------- xwords4/dawg/Polish/Makefile | 2 -- xwords4/dawg/Portuguese/Makefile.BrOffice | 2 -- xwords4/dawg/Portuguese/Makefile.Minho | 2 -- xwords4/dawg/Russian/Makefile | 2 -- xwords4/dawg/Slovak/Makefile | 2 -- xwords4/dawg/Spanish/Makefile | 2 -- xwords4/dawg/Swedish/Makefile | 2 -- xwords4/dawg/Turkish/Makefile | 2 -- 29 files changed, 63 deletions(-) delete mode 100644 xwords4/dawg/Makefile.2to8 diff --git a/xwords4/dawg/Arabic/Makefile b/xwords4/dawg/Arabic/Makefile index e53e54e7c..a90aad1ed 100644 --- a/xwords4/dawg/Arabic/Makefile +++ b/xwords4/dawg/Arabic/Makefile @@ -24,8 +24,6 @@ DICT2DAWGARGS = -r -nosort TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon # Empty dict diff --git a/xwords4/dawg/Catalan/Makefile b/xwords4/dawg/Catalan/Makefile index da54778d7..58d8fa255 100644 --- a/xwords4/dawg/Catalan/Makefile +++ b/xwords4/dawg/Catalan/Makefile @@ -37,8 +37,6 @@ LANG_SPECIAL_INFO = \ "NY" $(PBITMS)/large_ny.pbitm $(PBITMS)/small_ny.pbitm \ "QU" $(PBITMS)/large_qu.pbitm $(PBITMS)/small_qu.pbitm \ -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Catalan/DANOSC.txt.gz diff --git a/xwords4/dawg/Czech/Makefile b/xwords4/dawg/Czech/Makefile index 33e07e750..191d8e956 100644 --- a/xwords4/dawg/Czech/Makefile +++ b/xwords4/dawg/Czech/Makefile @@ -21,8 +21,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Czech/Czech.2-1-6.dict.gz diff --git a/xwords4/dawg/Danish/Makefile b/xwords4/dawg/Danish/Makefile index bee8320f9..1f363aea4 100644 --- a/xwords4/dawg/Danish/Makefile +++ b/xwords4/dawg/Danish/Makefile @@ -21,8 +21,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Danish/LarsDanish.dict.gz diff --git a/xwords4/dawg/Dutch/Makefile b/xwords4/dawg/Dutch/Makefile index 85d7eb1b1..fe660a137 100644 --- a/xwords4/dawg/Dutch/Makefile +++ b/xwords4/dawg/Dutch/Makefile @@ -21,8 +21,6 @@ ENC = ISO-8859-1 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Dutch/Dutch__unofficial_alphabetical.dict.gz diff --git a/xwords4/dawg/English/Makefile.BasEnglish b/xwords4/dawg/English/Makefile.BasEnglish index e44ba1f1b..fb44a33a2 100644 --- a/xwords4/dawg/English/Makefile.BasEnglish +++ b/xwords4/dawg/English/Makefile.BasEnglish @@ -21,8 +21,6 @@ DICT2DAWGARGS = -r -nosort TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: BasEnglish.dict.gz diff --git a/xwords4/dawg/English/Makefile.CSW b/xwords4/dawg/English/Makefile.CSW index fed7ba22a..3ca31b34c 100644 --- a/xwords4/dawg/English/Makefile.CSW +++ b/xwords4/dawg/English/Makefile.CSW @@ -19,8 +19,6 @@ XWLANG=CSW LANGCODE=en_US TARGET_TYPE=WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/CSW.dict.gz diff --git a/xwords4/dawg/English/Makefile.CollegeEng b/xwords4/dawg/English/Makefile.CollegeEng index 48fe28222..00fb0e95f 100644 --- a/xwords4/dawg/English/Makefile.CollegeEng +++ b/xwords4/dawg/English/Makefile.CollegeEng @@ -19,8 +19,6 @@ XWLANG=CollegeEng LANGCODE=en_US TARGET_TYPE=WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/CollegeEng.dict.gz diff --git a/xwords4/dawg/English/Makefile.Enable b/xwords4/dawg/English/Makefile.Enable index 937b66676..9c99404cb 100644 --- a/xwords4/dawg/English/Makefile.Enable +++ b/xwords4/dawg/English/Makefile.Enable @@ -24,8 +24,6 @@ XWLANG=Enable LANGCODE=en_US TARGET_TYPE=FRANK -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: Enable1.txt.gz diff --git a/xwords4/dawg/English/Makefile.OWL2 b/xwords4/dawg/English/Makefile.OWL2 index 9a2a2d415..b96b6768f 100644 --- a/xwords4/dawg/English/Makefile.OWL2 +++ b/xwords4/dawg/English/Makefile.OWL2 @@ -19,8 +19,6 @@ XWLANG = OWL2 LANGCODE = en_US TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/OWL2.dict.gz diff --git a/xwords4/dawg/English/Makefile.SOWPODS b/xwords4/dawg/English/Makefile.SOWPODS index 4c4cfefd1..1016f0678 100644 --- a/xwords4/dawg/English/Makefile.SOWPODS +++ b/xwords4/dawg/English/Makefile.SOWPODS @@ -19,8 +19,6 @@ XWLANG = SOWPODS LANGCODE = en_US TARGET_TYPE = WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/sow-twl.txt.gz diff --git a/xwords4/dawg/English/Makefile.TWL06 b/xwords4/dawg/English/Makefile.TWL06 index 28dd43ca1..937e8357d 100644 --- a/xwords4/dawg/English/Makefile.TWL06 +++ b/xwords4/dawg/English/Makefile.TWL06 @@ -20,8 +20,6 @@ XWLANG=TWL06 LANGCODE=en_US TARGET_TYPE=WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon # from http://www.3zsoftware.com/en/wordmagic/lists.php diff --git a/xwords4/dawg/French/Makefile b/xwords4/dawg/French/Makefile index e7ba219ae..ece3573bb 100644 --- a/xwords4/dawg/French/Makefile +++ b/xwords4/dawg/French/Makefile @@ -20,8 +20,6 @@ LANGCODE=fr_FR TARGET_TYPE ?= FRANK -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: ods3.txt.gz diff --git a/xwords4/dawg/French/Makefile.ODS4 b/xwords4/dawg/French/Makefile.ODS4 index 1ba915040..90b4976d6 100644 --- a/xwords4/dawg/French/Makefile.ODS4 +++ b/xwords4/dawg/French/Makefile.ODS4 @@ -20,8 +20,6 @@ LANGCODE=fr_FR TARGET_TYPE ?= PALM -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: $(XWDICTPATH)/French/ods4c.txt.gz diff --git a/xwords4/dawg/French/Makefile.ODS5 b/xwords4/dawg/French/Makefile.ODS5 index 9b047abd6..34009aefe 100644 --- a/xwords4/dawg/French/Makefile.ODS5 +++ b/xwords4/dawg/French/Makefile.ODS5 @@ -20,8 +20,6 @@ LANGCODE=fr_FR TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: $(XWDICTPATH)/French/ODS5.txt.gz diff --git a/xwords4/dawg/German/Makefile b/xwords4/dawg/German/Makefile index 2352b1de3..40bf56818 100644 --- a/xwords4/dawg/German/Makefile +++ b/xwords4/dawg/German/Makefile @@ -22,8 +22,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/German/HansGerman.dict.gz diff --git a/xwords4/dawg/Greek/Makefile b/xwords4/dawg/Greek/Makefile index ed542fce0..3d92bfa8d 100644 --- a/xwords4/dawg/Greek/Makefile +++ b/xwords4/dawg/Greek/Makefile @@ -25,8 +25,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Greek/greek.dict diff --git a/xwords4/dawg/Hex/Makefile b/xwords4/dawg/Hex/Makefile index 1b2b50d0d..8b074b646 100644 --- a/xwords4/dawg/Hex/Makefile +++ b/xwords4/dawg/Hex/Makefile @@ -22,8 +22,6 @@ ENC = UTF-8 TARGET_TYPE = WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon # Pass in your own dict here by setting DICT diff --git a/xwords4/dawg/Hëx/Makefile b/xwords4/dawg/Hëx/Makefile index 0f60e619b..044dd4fa6 100644 --- a/xwords4/dawg/Hëx/Makefile +++ b/xwords4/dawg/Hëx/Makefile @@ -22,8 +22,6 @@ ENC = UTF-8 TARGET_TYPE = WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon # Pass in your own dict here by setting DICT diff --git a/xwords4/dawg/Italian/Makefile b/xwords4/dawg/Italian/Makefile index 277943497..7b876d008 100644 --- a/xwords4/dawg/Italian/Makefile +++ b/xwords4/dawg/Italian/Makefile @@ -20,8 +20,6 @@ LANGCODE=it_IT TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon $(XWLANG)Main.dict.gz: $(XWDICTPATH)/Italian/ITALIANO.txt.gz diff --git a/xwords4/dawg/Makefile.2to8 b/xwords4/dawg/Makefile.2to8 deleted file mode 100644 index bb1777d27..000000000 --- a/xwords4/dawg/Makefile.2to8 +++ /dev/null @@ -1,7 +0,0 @@ -# -*-mode: Makefile -*- - -# These are the targets that almost all language makefiles will want. - -SHORT_WORD = 2 -LONG_WORD = 8 - diff --git a/xwords4/dawg/Polish/Makefile b/xwords4/dawg/Polish/Makefile index aae5e2736..8904e7d78 100644 --- a/xwords4/dawg/Polish/Makefile +++ b/xwords4/dawg/Polish/Makefile @@ -25,8 +25,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Polish/slowa-utf8.txt.gz diff --git a/xwords4/dawg/Portuguese/Makefile.BrOffice b/xwords4/dawg/Portuguese/Makefile.BrOffice index 70b7e284e..d52ffbe70 100644 --- a/xwords4/dawg/Portuguese/Makefile.BrOffice +++ b/xwords4/dawg/Portuguese/Makefile.BrOffice @@ -22,8 +22,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Portuguese/portugueseBR.txt.gz diff --git a/xwords4/dawg/Portuguese/Makefile.Minho b/xwords4/dawg/Portuguese/Makefile.Minho index 53f09d9cf..ab390dbb6 100644 --- a/xwords4/dawg/Portuguese/Makefile.Minho +++ b/xwords4/dawg/Portuguese/Makefile.Minho @@ -23,8 +23,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Portuguese/portuguese_pt.bz2 diff --git a/xwords4/dawg/Russian/Makefile b/xwords4/dawg/Russian/Makefile index e2d5ee127..d982c89c8 100644 --- a/xwords4/dawg/Russian/Makefile +++ b/xwords4/dawg/Russian/Makefile @@ -21,8 +21,6 @@ DICT2DAWGARGS = -r TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/RU5000.txt.gz diff --git a/xwords4/dawg/Slovak/Makefile b/xwords4/dawg/Slovak/Makefile index bb8f7bf38..b4819eabc 100644 --- a/xwords4/dawg/Slovak/Makefile +++ b/xwords4/dawg/Slovak/Makefile @@ -21,8 +21,6 @@ ENC = UTF-8 TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Slovak/slovnik_scrabble.dict.gz diff --git a/xwords4/dawg/Spanish/Makefile b/xwords4/dawg/Spanish/Makefile index 455a8c825..dea3afe5a 100644 --- a/xwords4/dawg/Spanish/Makefile +++ b/xwords4/dawg/Spanish/Makefile @@ -37,8 +37,6 @@ LANG_SPECIAL_INFO = \ "LL" $(PBITMS)/large_ll.pbitm $(PBITMS)/small_ll.pbitm \ "RR" $(PBITMS)/large_rr.pbitm $(PBITMS)/small_rr.pbitm \ -include ../Makefile.2to8 - include ../Makefile.langcommon #$(LANG)Main.dict.gz: SpanishMain.dict.gz diff --git a/xwords4/dawg/Swedish/Makefile b/xwords4/dawg/Swedish/Makefile index 56f363240..74e79a86f 100644 --- a/xwords4/dawg/Swedish/Makefile +++ b/xwords4/dawg/Swedish/Makefile @@ -24,8 +24,6 @@ NEWDAWG=whatever TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Swedish/swedish15.utf8.gz diff --git a/xwords4/dawg/Turkish/Makefile b/xwords4/dawg/Turkish/Makefile index d56dcc3cb..65ed2c44f 100644 --- a/xwords4/dawg/Turkish/Makefile +++ b/xwords4/dawg/Turkish/Makefile @@ -24,8 +24,6 @@ DICT2DAWGARGS = -r -nosort TARGET_TYPE ?= WINCE -include ../Makefile.2to8 - include ../Makefile.langcommon # Empty dict