[sword-cvs] sword/utilities Makefile.in,1.24,1.25 vpl2mod.cpp,1.18,1.19
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 30 Apr 2003 13:45:23 -0700
Update of /usr/local/cvsroot/sword/utilities
In directory www:/tmp/cvs-serv10422/utilities
Modified Files:
Makefile.in vpl2mod.cpp
Log Message:
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile.in 27 Feb 2003 23:34:22 -0000 1.24
--- Makefile.in 30 Apr 2003 20:45:18 -0000 1.25
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.3 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 14,21 ****
--- 14,37 ----
@SET_MAKE@
+ SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
***************
*** 23,33 ****
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 39,57 ----
top_builddir = ..
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+ AUTOMAKE = @AUTOMAKE@
+ AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
! transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 36,161 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
- BUILDEXAMPLES_FALSE = @BUILDEXAMPLES_FALSE@
- BUILDEXAMPLES_TRUE = @BUILDEXAMPLES_TRUE@
- BUILDTESTS_FALSE = @BUILDTESTS_FALSE@
- BUILDTESTS_TRUE = @BUILDTESTS_TRUE@
- BUILDUTILS_FALSE = @BUILDUTILS_FALSE@
- BUILDUTILS_TRUE = @BUILDUTILS_TRUE@
CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CONFDEF_FALSE = @CONFDEF_FALSE@
- CONFDEF_TRUE = @CONFDEF_TRUE@
- CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_CONFIG = @CURL_CONFIG@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
- ICUSWORD_FALSE = @ICUSWORD_FALSE@
- ICUSWORD_TRUE = @ICUSWORD_TRUE@
- ICU_FALSE = @ICU_FALSE@
- ICU_TRUE = @ICU_TRUE@
- INSTALLMGR_FALSE = @INSTALLMGR_FALSE@
- INSTALLMGR_TRUE = @INSTALLMGR_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTCONF_FALSE = @INSTCONF_FALSE@
- INSTCONF_TRUE = @INSTCONF_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
! MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
! MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
! MAKEINFO = @MAKEINFO@
! MINGW_FALSE = @MINGW_FALSE@
! MINGW_TRUE = @MINGW_TRUE@
! OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
PKGDATA = @PKGDATA@
RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
- ZLIB_FALSE = @ZLIB_FALSE@
- ZLIB_TRUE = @ZLIB_TRUE@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
- am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
dir_confdef = @dir_confdef@
enable_debug = @enable_debug@
enable_profile = @enable_profile@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
- includedir = @includedir@
- infodir = @infodir@
install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
target_cpu = @target_cpu@
target_mingw32 = @target_mingw32@
--- 60,99 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
+ host_alias = @host_alias@
host_triplet = @host@
!
! EXEEXT = @EXEEXT@
! OBJEXT = @OBJEXT@
! PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
! AS = @AS@
AWK = @AWK@
CC = @CC@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_CONFIG = @CURL_CONFIG@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
GENCCODE = @GENCCODE@
GENCMN = @GENCMN@
GENRB = @GENRB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
! OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
PKGDATA = @PKGDATA@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
dir_confdef = @dir_confdef@
enable_debug = @enable_debug@
enable_profile = @enable_profile@
install_sh = @install_sh@
target_cpu = @target_cpu@
target_mingw32 = @target_mingw32@
***************
*** 347,351 ****
--- 285,293 ----
xml2gbs_LDFLAGS =
+ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 370,373 ****
--- 312,316 ----
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CFLAGS = @CFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 378,381 ****
--- 321,325 ----
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \
$(cipherraw_SOURCES) $(ciphertest_SOURCES) \
***************
*** 396,400 ****
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
! $(AUTOMAKE) --foreign utilities/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--- 340,344 ----
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu utilities/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
***************
*** 514,581 ****
.c.o:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo:
! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.o:
! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.cpp.lo:
! @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCXX_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool:
--- 458,497 ----
.c.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `cygpath -w $<`
.c.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
! CCDEPMODE = @CCDEPMODE@
.cpp.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
! CXXDEPMODE = @CXXDEPMODE@
mostlyclean-libtool:
***************
*** 592,598 ****
ETAGSFLAGS =
- CTAGS = ctags
- CTAGSFLAGS =
-
tags: TAGS
--- 508,511 ----
***************
*** 620,638 ****
$$tags $$unique
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
--- 533,536 ----
***************
*** 641,645 ****
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--- 539,543 ----
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
***************
*** 648,658 ****
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--- 546,550 ----
distdir: $(DISTFILES)
! @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
***************
*** 741,765 ****
mostlyclean-libtool
- pdf: pdf-am
-
- pdf-am:
-
- ps: ps-am
-
- ps-am:
-
uninstall-am: uninstall-info-am
! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
! clean-libtool clean-noinstPROGRAMS ctags distclean \
! distclean-compile distclean-depend distclean-generic \
! distclean-libtool distclean-tags distdir dvi dvi-am info \
! info-am install install-am install-data install-data-am \
! install-exec install-exec-am install-info install-info-am \
! install-man install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
! uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 633,648 ----
mostlyclean-libtool
uninstall-am: uninstall-info-am
! .PHONY: GTAGS all all-am check check-am clean clean-generic \
! clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags distdir dvi dvi-am info info-am install \
! install-am install-data install-data-am install-exec \
! install-exec-am install-info install-info-am install-man \
! install-strip installcheck installcheck-am installdirs \
! maintainer-clean maintainer-clean-generic mostlyclean \
! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
! tags uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: vpl2mod.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/vpl2mod.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** vpl2mod.cpp 1 Oct 2002 22:04:59 -0000 1.18
--- vpl2mod.cpp 30 Apr 2003 20:45:18 -0000 1.19
***************
*** 73,110 ****
- char *parseVReg(char *buf) {
- char stage = 0;
-
- while (*buf) {
- switch (stage) {
- case 0:
- if (isalpha(*buf))
- stage++;
- break;
- case 1:
- if (isdigit(*buf))
- stage++;
- break;
- case 2:
- if (*buf == ':')
- stage++;
- break;
- case 3:
- if (isdigit(*buf))
- stage++;
- break;
- case 4:
- if (*buf == ' ') {
- *buf = 0;
- return ++buf;
- }
- break;
- }
- buf++;
- }
- return (stage == 4) ? buf : 0; // if we got to stage 4 return after key buf, else return 0;
- }
-
-
bool isKJVRef(const char *buf) {
VerseKey vk, test;
--- 73,76 ----
***************
*** 124,193 ****
- void fixText(char *text) {
- char *to = text;
- while(*text) {
- *to++ = *text++;
- *to++ = *text++;
- if (!*text)
- break;
- if (*text != ' ')
- std::cerr << "problem\n";
- else text++;
- }
- *to = 0;
- }
-
int main(int argc, char **argv) {
// Let's test our command line arguments
! if (argc < 2) {
// fprintf(stderr, "usage: %s <vpl_file> </path/to/mod> [0|1 - file includes prepended verse references]\n", argv[0]);
! fprintf(stderr, "usage: %s <source_vpl_file> </path/to/output/mod/> [0|1 - prepended verse refs] [0|1 - NT only]\n\n", argv[0]);
! fprintf(stderr, "\tWith no verse refs, source file must contain exactly 31102 lines.\n");
! fprintf(stderr, "\tThis is KJV verse count plus headings for MODULE,\n");
! fprintf(stderr, "\tTESTAMENT, BOOK, CHAPTER. An example snippet follows:\n\n");
! fprintf(stderr, "\t\tMODULE HEADER\n");
! fprintf(stderr, "\t\tOLD TESTAMENT HEADER\n");
! fprintf(stderr, "\t\tGENESIS HEADER\n");
! fprintf(stderr, "\t\tCHAPTER 1 HEADER\n");
! fprintf(stderr, "\t\tIn the beginning...\n\n");
! fprintf(stderr, "\t... implying there must also be a CHAPTER2 HEADER,\n");
! fprintf(stderr, "\tEXODUS HEADER, NEW TESTAMENT HEADER, etc. If there is no text for\n");
! fprintf(stderr, "\tthe header, a blank line must, at least, hold place.\n\n");
! fprintf(stderr, "\tWith verse refs, source file must simply contain any number of lines,\n");
! fprintf(stderr, "\tthat begin with the verse reference for which it is an entry. e.g.:\n\n");
! fprintf(stderr, "\t\tgen 1:0 CHAPTER 1 HEADER\n");
! fprintf(stderr, "\t\tgen 1:1 In the beginning...\n\n");
exit(-1);
}
// Let's see if we can open our input file
! int fd = open(argv[1], O_RDONLY|O_BINARY);
if (fd < 0) {
! fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], argv[1]);
exit(-2);
}
!
// Try to initialize a default set of datafiles and indicies at our
// datapath location passed to us from the user.
! if (RawText::createModule(argv[2])) {
! fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
exit(-3);
}
! // not used yet, but for future support of a vpl file with each line
! // prepended with verse reference, eg. "Gen 1:1 In the beginning..."
! bool vref = false;
! if (argc > 3)
! vref = (argv[3][0] == '0') ? false : true;
!
! // if 'nt' is the 4th arg, our vpl file only has the NT
! bool ntonly = false;
! if (argc > 4)
! ntonly = (argv[4][0] == '0') ? false : true;
!
// Do some initialization stuff
char *buffer = 0;
! RawText mod(argv[2]); // open our datapath with our RawText driver.
VerseKey vk;
vk.AutoNormalize(0);
--- 90,123 ----
int main(int argc, char **argv) {
// Let's test our command line arguments
! if (argc < 3) {
// fprintf(stderr, "usage: %s <vpl_file> </path/to/mod> [0|1 - file includes prepended verse references]\n", argv[0]);
! fprintf(stderr, "usage: %s </mod/files/path> <sourceFile> <verseBookPrefix_ie_Jn>\n\n", argv[0]);
exit(-1);
}
// Let's see if we can open our input file
! int fd = open(argv[2], O_RDONLY|O_BINARY);
if (fd < 0) {
! fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], argv[2]);
exit(-2);
}
! /*
// Try to initialize a default set of datafiles and indicies at our
// datapath location passed to us from the user.
! if (RawText::createModule(argv[1])) {
! fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[1]);
exit(-3);
}
! */
// Do some initialization stuff
char *buffer = 0;
! int chapter = 0;
! int verse = 0;
! char tmpBuf[254];
! RawText mod(argv[1]); // open our datapath with our RawText driver.
VerseKey vk;
vk.AutoNormalize(0);
***************
*** 200,259 ****
// input file as text for this entry in the module
mod = TOP;
- if (ntonly) vk = "Matthew 1:1";
int successive = 0; //part of hack below
while ((!mod.Error()) && (!readline(fd, &buffer))) {
! if (*buffer == '|') // comments, ignore line
continue;
! if (vref) {
! const char *verseText = parseVReg(buffer);
! if (!verseText) { // if we didn't find a valid verse ref
! std::cerr << "No valid verse ref found on line: " << buffer << "\n";
! exit(-4);
! }
! vk = buffer;
! if (vk.Error()) {
! std::cerr << "Error parsing key: " << buffer << "\n";
! exit(-5);
! }
! string orig = mod.getRawEntry();
! if (!isKJVRef(buffer)) {
! VerseKey origVK = vk;
! /* This block is functioning improperly -- problem with AutoNormalize???
! do {
! vk--;
! }
! while (!vk.Error() && !isKJVRef(vk)); */
! //hack to replace above:
! successive++;
! vk -= successive;
! orig = mod.getRawEntry();
! std::cerr << "Not a valid KJV ref: " << origVK << "\n";
! std::cerr << "appending to ref: " << vk << "\n";
! orig += " [ (";
! orig += origVK;
! orig += ") ";
! orig += verseText;
! orig += " ] ";
! verseText = orig.c_str();
! }
! else {
! successive = 0;
}
! if (orig.length() > 1)
! std::cerr << "Warning, overwriting verse: " << vk << std::endl;
!
! // ------------- End verse tests -----------------
! mod << verseText; // save text to module at current position
}
else {
! fixText(buffer);
! mod << buffer; // save text to module at current position
! mod++; // increment module position
}
}
--- 130,220 ----
// input file as text for this entry in the module
mod = TOP;
int successive = 0; //part of hack below
+ string header = "";
+
while ((!mod.Error()) && (!readline(fd, &buffer))) {
! string verseText = "";
!
! // chapter number
! if (!strncmp("$$$ ", buffer, 4)) {
! buffer[7] = 0;
! chapter = atoi(buffer+4);
continue;
! }
! // header
! if (!strncmp("<TD COLSPAN=4 VALIGN=TOP><FONT SIZE=2><B>", buffer, 41)) {
! char *end = strstr(buffer+41, "</B>");
! *end = 0;
! header = buffer+41;
! continue;
! }
! // verse number
! if (!strncmp("<TD VALIGN=TOP ALIGN=RIGHT WIDTH=12><FONT SIZE=2 COLOR=RED><B><SUP>", buffer, 67)) {
! char *end = strstr(buffer+67, "</SUP>");
! *end = 0;
! verse = atoi(buffer+67);
! continue;
! }
! // Actual verse data
! if (!strncmp("<TD VALIGN=TOP><FONT SIZE=2>", buffer, 28)) {
! char *end = strstr(buffer+28, "</FONT>");
! *end = 0;
! }
! // extra
! else {
! continue;
! }
! verseText = buffer + 28;
! if (header.length()) {
! verseText = "<title type=\"section\" subtype=\"x-preverse\">" + header + "</title>" + verseText;
! header = "";
! }
! string vsbuf = argv[3];
! sprintf(tmpBuf, "%i", chapter);
! vsbuf += ((string)" ") + tmpBuf;
! sprintf(tmpBuf, "%i", verse);
! vsbuf += ((string)":") + tmpBuf;
! vk = vsbuf.c_str();
! if (vk.Error()) {
! std::cerr << "Error parsing key: " << vsbuf << "\n";
! exit(-5);
! }
! string orig = mod.getRawEntry();
!
! if (!isKJVRef(vsbuf.c_str())) {
! VerseKey origVK = vk;
! /* This block is functioning improperly -- problem with AutoNormalize???
! do {
! vk--;
}
+ while (!vk.Error() && !isKJVRef(vk)); */
+ //hack to replace above:
+ successive++;
+ vk -= successive;
+ orig = mod.getRawEntry();
! std::cerr << "Not a valid KJV ref: " << origVK << "\n";
! std::cerr << "appending to ref: " << vk << "\n";
! orig += " [ (";
! orig += origVK;
! orig += ") ";
! orig += verseText;
! orig += " ] ";
! verseText = orig.c_str();
}
else {
! successive = 0;
}
+
+ if (orig.length() > 1)
+ std::cerr << "Warning, overwriting verse: " << vk << std::endl;
+
+ // ------------- End verse tests -----------------
+ std::cout << "adding "<< vk << "\n";
+ mod << verseText.c_str(); // save text to module at current position
}