[sword-cvs] sword/utilities Makefile.in,1.20,1.21 Makefile.am,1.13,1.14 normcode.cpp,1.7,NONE

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/utilities
In directory www:/tmp/cvs-serv29574

Modified Files:
	Makefile.in Makefile.am 
Removed Files:
	normcode.cpp 
Log Message:
removed normcode (unnecessary as uconv from ICU handles this functionality)

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.in	8 Jan 2003 09:39:57 -0000	1.20
--- Makefile.in	26 Jan 2003 15:46:26 -0000	1.21
***************
*** 113,122 ****
  $(ICUPROG)
  
! @ICU_TRUE@ICUPROG = normcode
  @ICU_FALSE@ICUPROG = 
  
- @ICU_TRUE@normcode_SOURCES = normcode.cpp
- @ICU_TRUE@normcode_LDADD = -licui18n -licuuc
- 
  cipherraw_SOURCES = cipherraw.cpp
  ciphertest_SOURCES = ciphertest.cpp
--- 113,119 ----
  $(ICUPROG)
  
! @ICU_TRUE@ICUPROG = 
  @ICU_FALSE@ICUPROG = 
  
  cipherraw_SOURCES = cipherraw.cpp
  ciphertest_SOURCES = ciphertest.cpp
***************
*** 155,159 ****
  @ICU_TRUE@	addgb$(EXEEXT) imp2gbs$(EXEEXT) imp2ld$(EXEEXT) \
  @ICU_TRUE@	imp2vs$(EXEEXT) mod2imp$(EXEEXT) thml2gbs$(EXEEXT) \
! @ICU_TRUE@	mod2osis$(EXEEXT) normcode$(EXEEXT)
  @ICU_FALSE@noinst_PROGRAMS = cipherraw$(EXEEXT) ciphertest$(EXEEXT) \
  @ICU_FALSE@	ciphertest2$(EXEEXT) lexdump$(EXEEXT) \
--- 152,156 ----
  @ICU_TRUE@	addgb$(EXEEXT) imp2gbs$(EXEEXT) imp2ld$(EXEEXT) \
  @ICU_TRUE@	imp2vs$(EXEEXT) mod2imp$(EXEEXT) thml2gbs$(EXEEXT) \
! @ICU_TRUE@	mod2osis$(EXEEXT)
  @ICU_FALSE@noinst_PROGRAMS = cipherraw$(EXEEXT) ciphertest$(EXEEXT) \
  @ICU_FALSE@	ciphertest2$(EXEEXT) lexdump$(EXEEXT) \
***************
*** 256,264 ****
  modwrite_DEPENDENCIES =
  modwrite_LDFLAGS =
- @ICU_TRUE@am_normcode_OBJECTS = normcode.$(OBJEXT)
- normcode_OBJECTS = $(am_normcode_OBJECTS)
- @ICU_TRUE@normcode_DEPENDENCIES =
- @ICU_FALSE@normcode_DEPENDENCIES =
- normcode_LDFLAGS =
  am_step2vpl_OBJECTS = step2vpl.$(OBJEXT)
  step2vpl_OBJECTS = $(am_step2vpl_OBJECTS)
--- 253,256 ----
***************
*** 303,307 ****
  @AMDEP_TRUE@	./$(DEPDIR)/mod2imp.Po ./$(DEPDIR)/mod2osis.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/mod2vpl.Po ./$(DEPDIR)/mod2zmod.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/modwrite.Po ./$(DEPDIR)/normcode.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/step2vpl.Po ./$(DEPDIR)/stepdump.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/thml2gbs.Po ./$(DEPDIR)/txt2sword.Po \
--- 295,299 ----
  @AMDEP_TRUE@	./$(DEPDIR)/mod2imp.Po ./$(DEPDIR)/mod2osis.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/mod2vpl.Po ./$(DEPDIR)/mod2zmod.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/modwrite.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/step2vpl.Po ./$(DEPDIR)/stepdump.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/thml2gbs.Po ./$(DEPDIR)/txt2sword.Po \
***************
*** 330,338 ****
  	$(lexdump_SOURCES) $(mkfastmod_SOURCES) $(mod2imp_SOURCES) \
  	$(mod2osis_SOURCES) $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) \
! 	$(modwrite_SOURCES) $(normcode_SOURCES) $(step2vpl_SOURCES) \
  	$(stepdump_SOURCES) $(thml2gbs_SOURCES) $(txt2sword_SOURCES) \
  	$(vpl2mod_SOURCES)
  DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) $(cipherraw_SOURCES) $(ciphertest_SOURCES) $(ciphertest2_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) $(imp2vs_SOURCES) $(lexdump_SOURCES) $(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) $(modwrite_SOURCES) $(normcode_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) $(thml2gbs_SOURCES) $(txt2sword_SOURCES) $(vpl2mod_SOURCES)
  
  all: all-am
--- 322,330 ----
  	$(lexdump_SOURCES) $(mkfastmod_SOURCES) $(mod2imp_SOURCES) \
  	$(mod2osis_SOURCES) $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) \
! 	$(modwrite_SOURCES) $(step2vpl_SOURCES) \
  	$(stepdump_SOURCES) $(thml2gbs_SOURCES) $(txt2sword_SOURCES) \
  	$(vpl2mod_SOURCES)
  DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) $(cipherraw_SOURCES) $(ciphertest_SOURCES) $(ciphertest2_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) $(imp2vs_SOURCES) $(lexdump_SOURCES) $(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) $(modwrite_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) $(thml2gbs_SOURCES) $(txt2sword_SOURCES) $(vpl2mod_SOURCES)
  
  all: all-am
***************
*** 406,412 ****
  	@rm -f modwrite$(EXEEXT)
  	$(CXXLINK) $(modwrite_LDFLAGS) $(modwrite_OBJECTS) $(modwrite_LDADD) $(LIBS)
- normcode$(EXEEXT): $(normcode_OBJECTS) $(normcode_DEPENDENCIES) 
- 	@rm -f normcode$(EXEEXT)
- 	$(CXXLINK) $(normcode_LDFLAGS) $(normcode_OBJECTS) $(normcode_LDADD) $(LIBS)
  step2vpl$(EXEEXT): $(step2vpl_OBJECTS) $(step2vpl_DEPENDENCIES) 
  	@rm -f step2vpl$(EXEEXT)
--- 398,401 ----
***************
*** 449,453 ****
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod2zmod.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modwrite.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normcode.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/step2vpl.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepdump.Po@am__quote@
--- 438,441 ----

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	1 Nov 2002 00:30:42 -0000	1.13
--- Makefile.am	26 Jan 2003 15:46:26 -0000	1.14
***************
*** 8,12 ****
  
  if ICU
! ICUPROG = normcode
  else
  ICUPROG =
--- 8,12 ----
  
  if ICU
! ICUPROG = 
  else
  ICUPROG =
***************
*** 16,21 ****
  
  if ICU
- normcode_SOURCES = normcode.cpp
- normcode_LDADD = -licui18n -licuuc
  endif
  
--- 16,19 ----

--- normcode.cpp DELETED ---