[sword-cvs] sword/utilities Makefile.am,1.14,1.15 Makefile.in,1.21,1.22

sword@www.crosswire.org sword@www.crosswire.org
Thu, 13 Feb 2003 15:27:55 -0700


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

Modified Files:
	Makefile.am Makefile.in 
Log Message:
updates to make system. hope it works.


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am	26 Jan 2003 15:46:26 -0000	1.14
--- Makefile.am	13 Feb 2003 22:27:53 -0000	1.15
***************
*** 5,9 ****
  noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
  mod2vpl vpl2mod stepdump step2vpl mod2zmod gbfidx modwrite addvs addld emptyvss \
! txt2sword addgb imp2gbs imp2ld imp2vs mod2imp thml2gbs mod2osis
  
  if ICU
--- 5,9 ----
  noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
  mod2vpl vpl2mod stepdump step2vpl mod2zmod gbfidx modwrite addvs addld emptyvss \
! txt2sword addgb imp2gbs imp2ld imp2vs mod2imp thml2gbs mod2osis xml2gbs
  
  if ICU
***************
*** 42,43 ****
--- 42,44 ----
  thml2gbs_SOURCES = thml2gbs.cpp
  mod2osis_SOURCES = mod2osis.cpp
+ xml2gbs_SOURCES = xml2gbs.cpp

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.in	26 Jan 2003 15:46:26 -0000	1.21
--- Makefile.in	13 Feb 2003 22:27:53 -0000	1.22
***************
*** 1,3 ****
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
  # @configure_input@
  
--- 1,3 ----
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
  # @configure_input@
  
***************
*** 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@
--- 14,21 ----
***************
*** 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 = :
--- 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 = :
***************
*** 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@
--- 36,154 ----
  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@
  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__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@
***************
*** 110,114 ****
  noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
  mod2vpl vpl2mod stepdump step2vpl mod2zmod gbfidx modwrite addvs addld emptyvss \
! txt2sword addgb imp2gbs imp2ld imp2vs mod2imp thml2gbs mod2osis\
  $(ICUPROG)
  
--- 165,169 ----
  noinst_PROGRAMS = cipherraw ciphertest ciphertest2 lexdump mkfastmod \
  mod2vpl vpl2mod stepdump step2vpl mod2zmod gbfidx modwrite addvs addld emptyvss \
! txt2sword addgb imp2gbs imp2ld imp2vs mod2imp thml2gbs mod2osis xml2gbs\
  $(ICUPROG)
  
***************
*** 140,143 ****
--- 195,199 ----
  thml2gbs_SOURCES = thml2gbs.cpp
  mod2osis_SOURCES = mod2osis.cpp
+ xml2gbs_SOURCES = xml2gbs.cpp
  subdir = utilities
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 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) \
--- 208,212 ----
  @ICU_TRUE@	addgb$(EXEEXT) imp2gbs$(EXEEXT) imp2ld$(EXEEXT) \
  @ICU_TRUE@	imp2vs$(EXEEXT) mod2imp$(EXEEXT) thml2gbs$(EXEEXT) \
! @ICU_TRUE@	mod2osis$(EXEEXT) xml2gbs$(EXEEXT)
  @ICU_FALSE@noinst_PROGRAMS = cipherraw$(EXEEXT) ciphertest$(EXEEXT) \
  @ICU_FALSE@	ciphertest2$(EXEEXT) lexdump$(EXEEXT) \
***************
*** 161,165 ****
  @ICU_FALSE@	txt2sword$(EXEEXT) addgb$(EXEEXT) imp2gbs$(EXEEXT) \
  @ICU_FALSE@	imp2ld$(EXEEXT) imp2vs$(EXEEXT) mod2imp$(EXEEXT) \
! @ICU_FALSE@	thml2gbs$(EXEEXT) mod2osis$(EXEEXT)
  PROGRAMS = $(noinst_PROGRAMS)
  
--- 217,221 ----
  @ICU_FALSE@	txt2sword$(EXEEXT) addgb$(EXEEXT) imp2gbs$(EXEEXT) \
  @ICU_FALSE@	imp2ld$(EXEEXT) imp2vs$(EXEEXT) mod2imp$(EXEEXT) \
! @ICU_FALSE@	thml2gbs$(EXEEXT) mod2osis$(EXEEXT) xml2gbs$(EXEEXT)
  PROGRAMS = $(noinst_PROGRAMS)
  
***************
*** 278,287 ****
  vpl2mod_DEPENDENCIES =
  vpl2mod_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
--- 334,344 ----
  vpl2mod_DEPENDENCIES =
  vpl2mod_LDFLAGS =
+ am_xml2gbs_OBJECTS = xml2gbs.$(OBJEXT)
+ xml2gbs_OBJECTS = $(am_xml2gbs_OBJECTS)
+ xml2gbs_LDADD = $(LDADD)
+ xml2gbs_DEPENDENCIES =
+ xml2gbs_LDFLAGS =
  
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
***************
*** 295,302 ****
  @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 \
! @AMDEP_TRUE@	./$(DEPDIR)/vpl2mod.Po
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- 352,359 ----
  @AMDEP_TRUE@	./$(DEPDIR)/mod2imp.Po ./$(DEPDIR)/mod2osis.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/mod2vpl.Po ./$(DEPDIR)/mod2zmod.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/modwrite.Po ./$(DEPDIR)/step2vpl.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/stepdump.Po ./$(DEPDIR)/thml2gbs.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/txt2sword.Po ./$(DEPDIR)/vpl2mod.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/xml2gbs.Po
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
***************
*** 306,310 ****
  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)
--- 363,366 ----
***************
*** 315,319 ****
  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) \
--- 371,374 ----
***************
*** 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
--- 377,385 ----
  	$(lexdump_SOURCES) $(mkfastmod_SOURCES) $(mod2imp_SOURCES) \
  	$(mod2osis_SOURCES) $(mod2vpl_SOURCES) $(mod2zmod_SOURCES) \
! 	$(modwrite_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) \
! 	$(thml2gbs_SOURCES) $(txt2sword_SOURCES) $(vpl2mod_SOURCES) \
! 	$(xml2gbs_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) $(xml2gbs_SOURCES)
  
  all: all-am
***************
*** 413,416 ****
--- 468,474 ----
  	@rm -f vpl2mod$(EXEEXT)
  	$(CXXLINK) $(vpl2mod_LDFLAGS) $(vpl2mod_OBJECTS) $(vpl2mod_LDADD) $(LIBS)
+ xml2gbs$(EXEEXT): $(xml2gbs_OBJECTS) $(xml2gbs_DEPENDENCIES) 
+ 	@rm -f xml2gbs$(EXEEXT)
+ 	$(CXXLINK) $(xml2gbs_LDFLAGS) $(xml2gbs_OBJECTS) $(xml2gbs_LDADD) $(LIBS)
  
  mostlyclean-compile:
***************
*** 443,446 ****
--- 501,505 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2sword.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpl2mod.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml2gbs.Po@am__quote@
  
  distclean-depend:
***************
*** 448,487 ****
  
  .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:
--- 507,574 ----
  
  .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:
***************
*** 498,501 ****
--- 585,591 ----
  ETAGSFLAGS =
  
+ CTAGS = ctags
+ CTAGSFLAGS =
+ 
  tags: TAGS
  
***************
*** 523,526 ****
--- 613,631 ----
  	     $$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` \
***************
*** 529,533 ****
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
--- 634,638 ----
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
***************
*** 536,540 ****
  
  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,/[^/]*$$,,'`; \
--- 641,651 ----
  
  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,/[^/]*$$,,'`; \
***************
*** 623,638 ****
  	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.
--- 734,758 ----
  	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.