[sword-cvs] sword/icu Makefile.am,1.3,1.4 Makefile.in,1.11,1.12

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/icu
In directory www:/tmp/cvs-serv15674/icu

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Martin: bugs in the make system fixed under Daniel's supervision.
Now ready for "make dist".


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/icu/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	8 Oct 2002 16:13:41 -0000	1.3
--- Makefile.am	1 Mar 2003 18:57:06 -0000	1.4
***************
*** 1,9 ****
  AUTOMAKE_OPTIONS = 1.6
  
- if ICU
- #pkglib_DATA = swicu.dat
- #else
- #endif
- 
  swicuSOURCES = translit_BETA_Greek.txt
  swicuSOURCES += translit_BGreek_Greek.txt
--- 1,4 ----
***************
*** 26,48 ****
  swicuSOURCES += translit_Latin_Arabic.txt
  swicuSOURCES += translit_Latin_Hebrew.txt
! swicuSOURCES += translit_swordindex.txt 
! endif
  
- CLEANFILES = *.res *.lst *.mk *.mak swicu.dat
  
  pkglib_DATA = $(swicuSOURCES:.txt=.res)
  
! SUFFIXES = .txt .res .dat
! 
! #swicu.dat: $(swicuDATA) trans.lst icupkg.mk
! #	$(PKGDATA) -O icupkg.mk -p swicu -m common -T . -s . \
! #		-d . -r $(VERSION) trans.lst
! 
! #trans.lst:
! #	ls -1 *.res > trans.lst
  
! #icupkg.mk:
! #	@echo "GENCCODE=@GENCCODE@" > icupkg.mk
! #	@echo "GENCMN=@GENCMN@" >> icupkg.mk
  
  .txt.res:
--- 21,36 ----
  swicuSOURCES += translit_Latin_Arabic.txt
  swicuSOURCES += translit_Latin_Hebrew.txt
! swicuSOURCES += translit_swordindex.txt
  
  
+ if ICU
  pkglib_DATA = $(swicuSOURCES:.txt=.res)
+ else
+ EXTRA_DIST = $(swicuSOURCES)
+ endif
  
! CLEANFILES = *.res *.lst *.mk *.mak swicu.dat
  
! SUFFIXES = .txt .res .dat
  
  .txt.res:

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/icu/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.in	27 Feb 2003 23:34:22 -0000	1.11
--- Makefile.in	1 Mar 2003 18:57:06 -0000	1.12
***************
*** 168,184 ****
  AUTOMAKE_OPTIONS = 1.6
  
- 
- #pkglib_DATA = swicu.dat
- #else
- #endif
  #swicuSOURCES += translit_HTMLEnt_Unicode.txt
  #swicuSOURCES += translit_Han_Pinyin.txt
  #swicuSOURCES += translit_Kanji_English.txt
  #swicuSOURCES += translit_Kanji_OnRomaji.txt
! @ICU_TRUE@swicuSOURCES = translit_BETA_Greek.txt translit_BGreek_Greek.txt translit_CCAT_Hebrew.txt translit_CCAT_Syriac.txt translit_Latin_Armenian.txt translit_Latin_Coptic.txt translit_Latin_Ethiopic.txt translit_Latin_Georgian.txt translit_Latin_Gothic.txt translit_Latin_Syriac.txt translit_Latin_Thai.txt translit_Latin_Ugaritic.txt translit_Any_Latin1.txt translit_Any_Latex.txt translit_Latin_Arabic.txt translit_Latin_Hebrew.txt translit_swordindex.txt 
  
! CLEANFILES = *.res *.lst *.mk *.mak swicu.dat
  
! pkglib_DATA = $(swicuSOURCES:.txt=.res)
  
  SUFFIXES = .txt .res .dat
--- 168,181 ----
  AUTOMAKE_OPTIONS = 1.6
  
  #swicuSOURCES += translit_HTMLEnt_Unicode.txt
  #swicuSOURCES += translit_Han_Pinyin.txt
  #swicuSOURCES += translit_Kanji_English.txt
  #swicuSOURCES += translit_Kanji_OnRomaji.txt
! swicuSOURCES = translit_BETA_Greek.txt translit_BGreek_Greek.txt translit_CCAT_Hebrew.txt translit_CCAT_Syriac.txt translit_Latin_Armenian.txt translit_Latin_Coptic.txt translit_Latin_Ethiopic.txt translit_Latin_Georgian.txt translit_Latin_Gothic.txt translit_Latin_Syriac.txt translit_Latin_Thai.txt translit_Latin_Ugaritic.txt translit_Any_Latin1.txt translit_Any_Latex.txt translit_Latin_Arabic.txt translit_Latin_Hebrew.txt translit_swordindex.txt
  
! @ICU_TRUE@pkglib_DATA = $(swicuSOURCES:.txt=.res)
! @ICU_FALSE@EXTRA_DIST = $(swicuSOURCES)
  
! CLEANFILES = *.res *.lst *.mk *.mak swicu.dat
  
  SUFFIXES = .txt .res .dat
***************
*** 352,366 ****
  	uninstall-info-am uninstall-pkglibDATA
  
- 
- #swicu.dat: $(swicuDATA) trans.lst icupkg.mk
- #	$(PKGDATA) -O icupkg.mk -p swicu -m common -T . -s . \
- #		-d . -r $(VERSION) trans.lst
- 
- #trans.lst:
- #	ls -1 *.res > trans.lst
- 
- #icupkg.mk:
- #	@echo "GENCCODE=@GENCCODE@" > icupkg.mk
- #	@echo "GENCMN=@GENCMN@" >> icupkg.mk
  
  .txt.res:
--- 349,352 ----