[sword-cvs] sword/src/modules/filters Makefile.am,1.14,1.15

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv15674/src/modules/filters

Modified Files:
	Makefile.am 
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/src/modules/filters/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am	20 Feb 2003 14:13:25 -0000	1.14
--- Makefile.am	1 Mar 2003 18:57:06 -0000	1.15
***************
*** 47,56 ****
  libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp
  
  libsword_la_SOURCES += $(filtersdir)/thmlolb.cpp
  
  libsword_la_SOURCES += $(filtersdir)/greeklexattribs.cpp
  
- if ICU
- ICUDEFS = -D_ICU_
  SWICUSRC = $(filtersdir)/utf8transliterator.cpp
  SWICUSRC += $(filtersdir)/utf8nfc.cpp
--- 47,58 ----
  libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp
  
+ libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
+ libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
+ libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
+ 
  libsword_la_SOURCES += $(filtersdir)/thmlolb.cpp
  
  libsword_la_SOURCES += $(filtersdir)/greeklexattribs.cpp
  
  SWICUSRC = $(filtersdir)/utf8transliterator.cpp
  SWICUSRC += $(filtersdir)/utf8nfc.cpp
***************
*** 58,80 ****
  SWICUSRC += $(filtersdir)/utf8arshaping.cpp
  SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
- else
- SWICUSRC =
- ICUDEFS = 
- endif
  
  if ICUSWORD
! ICUDEFS = -D_ICU_ -D_ICUSWORD_
! SWICUSRC = $(filtersdir)/utf8transliterator.cpp
! SWICUSRC += $(filtersdir)/utf8nfc.cpp
! SWICUSRC += $(filtersdir)/utf8nfkd.cpp
! SWICUSRC += $(filtersdir)/utf8arshaping.cpp
! SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
! endif
! 
  libsword_la_SOURCES += $(SWICUSRC)
! DEFS += $(ICUDEFS)
! 
! libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
! libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
! libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
  
--- 60,74 ----
  SWICUSRC += $(filtersdir)/utf8arshaping.cpp
  SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
  
+ if ICU
+ DEFS += -D_ICU_
+ libsword_la_SOURCES += $(SWICUSRC)
+ else
  if ICUSWORD
! DEFS += -D_ICU_ -D_ICUSWORD_
  libsword_la_SOURCES += $(SWICUSRC)
! else
! EXTRA_DIST = $(SWICUSRC)
! endif
! endif