[sword-cvs] sword/include Makefile.am,1.16,1.17 swversion.h,1.9,1.10

[sword@www.crosswire.org]

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

Modified Files:
	Makefile.am swversion.h 
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/include/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am	28 Feb 2003 22:52:54 -0000	1.16
--- Makefile.am	1 Mar 2003 18:57:06 -0000	1.17
***************
*** 19,22 ****
--- 19,23 ----
  pkginclude_HEADERS += $(swincludedir)/gbfosis.h
  pkginclude_HEADERS += $(swincludedir)/gbfplain.h
+ pkginclude_HEADERS += $(swincludedir)/gbfredletterwords.h
  pkginclude_HEADERS += $(swincludedir)/gbfrtf.h
  pkginclude_HEADERS += $(swincludedir)/gbfstrongs.h
***************
*** 33,36 ****
--- 34,42 ----
  pkginclude_HEADERS += $(swincludedir)/multimapwdef.h
  pkginclude_HEADERS += $(swincludedir)/nullim.h
+ pkginclude_HEADERS += $(swincludedir)/osismorph.h
+ pkginclude_HEADERS += $(swincludedir)/osisplain.h
+ pkginclude_HEADERS += $(swincludedir)/osisrtf.h
+ pkginclude_HEADERS += $(swincludedir)/osisstrongs.h
+ pkginclude_HEADERS += $(swincludedir)/plainfootnotes.h
  pkginclude_HEADERS += $(swincludedir)/plainfootnotes.h
  pkginclude_HEADERS += $(swincludedir)/plainhtml.h
***************
*** 87,90 ****
--- 93,97 ----
  pkginclude_HEADERS += $(swincludedir)/thmlmorph.h
  pkginclude_HEADERS += $(swincludedir)/thmlolb.h
+ pkginclude_HEADERS += $(swincludedir)/thmlosis.h
  pkginclude_HEADERS += $(swincludedir)/thmlplain.h
  pkginclude_HEADERS += $(swincludedir)/thmlrtf.h
***************
*** 98,101 ****
--- 105,110 ----
  pkginclude_HEADERS += $(swincludedir)/untgz.h
  pkginclude_HEADERS += $(swincludedir)/utf16utf8.h
+ pkginclude_HEADERS += $(swincludedir)/utf8arshaping.h
+ pkginclude_HEADERS += $(swincludedir)/utf8bidireorder.h
  pkginclude_HEADERS += $(swincludedir)/utf8cantillation.h
  pkginclude_HEADERS += $(swincludedir)/utf8greekaccents.h
***************
*** 103,106 ****
--- 112,118 ----
  pkginclude_HEADERS += $(swincludedir)/utf8html.h
  pkginclude_HEADERS += $(swincludedir)/utf8latin1.h
+ pkginclude_HEADERS += $(swincludedir)/utf8nfc.h
+ pkginclude_HEADERS += $(swincludedir)/utf8nfkd.h
+ pkginclude_HEADERS += $(swincludedir)/utf8transliterator.h
  pkginclude_HEADERS += $(swincludedir)/utf8utf16.h
  pkginclude_HEADERS += $(swincludedir)/utilconf.h
***************
*** 117,130 ****
  pkginclude_HEADERS += $(swincludedir)/zverse.h
  
- if ICU
- ICU_HEAD  = $(swincludedir)/utf8arshaping.h
- ICU_HEAD += $(swincludedir)/utf8bidireorder.h
- ICU_HEAD += $(swincludedir)/utf8nfc.h
- ICU_HEAD += $(swincludedir)/utf8nfkd.h
- ICU_HEAD += $(swincludedir)/utf8transliterator.h
- else
- ICU_HEAD =
- endif
- 
  if INSTALLMGR
  REMOTE_HEAD  = $(swincludedir)/swremotemgr.h
--- 129,132 ----
***************
*** 134,138 ****
  endif
  
- 
- pkginclude_HEADERS += $(ICU_HEAD)
  pkginclude_HEADERS += $(REMOTE_HEAD)
--- 136,138 ----

Index: swversion.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swversion.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** swversion.h	22 Oct 2002 01:28:49 -0000	1.9
--- swversion.h	1 Mar 2003 18:57:06 -0000	1.10
***************
*** 21,25 ****
  
  #ifndef SWORDVER
! #define SWORDVER "1.5.5"
  #endif
  
--- 21,25 ----
  
  #ifndef SWORDVER
! #define SWORDVER "1.5.5.99"
  #endif