This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit dff34103206566687be8d406871fa68f70f4fce8
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Wed Mar 27 18:07:08 2013 +0100
moved non templated functions to newly created FileReaderAscii.c and added
new functionality
---
Makefile.in | 777 -------------------------------------
aclocal.m4 | 82 ++--
src/apps/Makefile.am | 8 +-
src/fileclasses/FileReaderAscii.cc | 237 +++++++++++
src/fileclasses/FileReaderAscii.h | 119 +++---
src/fileclasses/Makefile.am | 18 +-
src/models/Makefile.am | 4 +-
7 files changed, 332 insertions(+), 913 deletions(-)
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 65dbdee..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,777 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_gdal.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
- || { sleep 5 && rm -rf "$(distdir)"; }; \
- else :; fi
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FANN_CFLAGS = @FANN_CFLAGS@
-FANN_LIBS = @FANN_LIBS@
-FC = @FC@
-FCFLAGS = @FCFLAGS@
-FGREP = @FGREP@
-FILECLASSES_OPT = @FILECLASSES_OPT@
-GDAL_CFLAGS = @GDAL_CFLAGS@
-GDAL_CONFIG = @GDAL_CONFIG@
-GDAL_DEP_LDFLAGS = @GDAL_DEP_LDFLAGS@
-GDAL_LDFLAGS = @GDAL_LDFLAGS@
-GDAL_OGR_ENABLED = @GDAL_OGR_ENABLED@
-GDAL_VERSION = @GDAL_VERSION@
-GREP = @GREP@
-GSL_CFLAGS = @GSL_CFLAGS@
-GSL_LIBS = @GSL_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NLOPT_CFLAGS = @NLOPT_CFLAGS@
-NLOPT_LIBS = @NLOPT_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# to include m4 macros into aclocal.m4
-ACLOCAL_AMFLAGS = -I m4
-
-# the subdirectories of the project to go into
-SUBDIRS = src/base \
- src/imageclasses \
- src/algorithms \
- src/models \
- $(FILECLASSES_OPT) \
- src/apps
-
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool config.lt
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -755 \
- -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c
>$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-lzip: distdir
- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9}
>$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c
>$(distdir).tar.xz
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.lz*) \
- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base"
\
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- && cd "$$am__cwd" \
- || exit 1
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
- '$$(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- $(am__cd) '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index d3ae567..e1d3c19 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
@@ -48,8 +47,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search
path])
@@ -95,8 +93,7 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -144,9 +141,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -180,15 +177,12 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation,
Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -198,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -214,21 +208,19 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -310,14 +302,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -357,7 +349,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -422,7 +413,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -487,13 +478,10 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -715,15 +703,12 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -855,15 +840,12 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -886,14 +868,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -901,13 +882,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -983,14 +964,12 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -1013,13 +992,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 2
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1028,13 +1007,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1056,11 +1035,10 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
index 59e5d68..e54f3bb 100644
--- a/src/apps/Makefile.am
+++ b/src/apps/Makefile.am
@@ -1,7 +1,7 @@
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(GDAL_CFLAGS)
@AM_CXXFLAGS@
-AM_LDFLAGS = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/imageclasses/libimageClasses.la @AM_LDFLAGS@
+AM_LDFLAGS = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/imageclasses/libimageClasses.la
$(top_builddir)/src/fileclasses/libfileClasses.la @AM_LDFLAGS@
#LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/models/libmodels.la
$(top_builddir)/src/models/libprospect.la
$(top_builddir)/src/imageclasses/libimageClasses.la
-LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/models/libmodels.la
$(top_builddir)/src/imageclasses/libimageClasses.la
+LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/models/libmodels.la
$(top_builddir)/src/imageclasses/libimageClasses.la
$(top_builddir)/src/fileclasses/libfileClasses.la
###############################################################################
# THE PROGRAMS TO BUILD
###############################################################################
@@ -25,7 +25,7 @@ endif
if USE_LAS
bin_PROGRAMS += pklas2img
pklas2img_SOURCES = pklas2img.cc
-pklas2img_LDADD = -L$(top_builddir)/src/fileclasses -lfileClasses -llas
$(AM_LDFLAGS)
+pklas2img_LDADD = -llas $(AM_LDFLAGS)
endif
if USE_NLOPT
bin_PROGRAMS += pksensormodel pkopt_svm
@@ -45,7 +45,7 @@ pkdumpimg_SOURCES = pkdumpimg.cc
pkdumpogr_SOURCES = pkdumpogr.h pkdumpogr.cc
pksieve_SOURCES = pksieve.cc
pkstat_SOURCES = $(top_srcdir)/src/algorithms/Histogram.h pkstat.cc
-pkstat_LDADD = -L$(top_builddir)/src/fileclasses -llas -lfileClasses
$(GSL_LIBS) $(AM_LDFLAGS)
+pkstat_LDADD = -llas $(GSL_LIBS) $(AM_LDFLAGS)
pkstatogr_SOURCES = pkstatogr.cc
pkegcs_SOURCES = pkegcs.cc
pkegcs_LDADD = -lgdal $(AM_LDFLAGS) -lgdal
diff --git a/src/fileclasses/FileReaderAscii.cc
b/src/fileclasses/FileReaderAscii.cc
new file mode 100644
index 0000000..b5419ab
--- /dev/null
+++ b/src/fileclasses/FileReaderAscii.cc
@@ -0,0 +1,237 @@
+/**********************************************************************
+FileReaderAscii.cc: class to read ASCII files using (colum based)
+Copyright (C) 2008-2013 Pieter Kempeneers
+
+This file is part of pktools
+
+pktools is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pktools is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with pktools. If not, see <http://www.gnu.org/licenses/>.
+***********************************************************************/
+
+#include <iostream>
+#include "FileReaderAscii.h"
+
+FileReaderAscii::FileReaderAscii(void)
+ : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs(' '),m_comment('#'){
+}
+
+FileReaderAscii::FileReaderAscii(const std::string& filename)
+ : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs(' '),m_comment('#'){
+ open(filename);
+}
+
+FileReaderAscii::FileReaderAscii(const std::string& filename, const char&
fieldseparator)
+ : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs('
'),m_comment(fieldseparator){
+ open(filename);
+}
+
+FileReaderAscii::~FileReaderAscii(void)
+{
+}
+
+void FileReaderAscii::open(const std::string& filename){
+ m_filename=filename;
+ m_ifstream.open(filename.c_str(),std::ios_base::in);
+ if(!(m_ifstream)){
+ std::string errorString;
+ errorString="Error: could not open file ";
+ errorString+=filename;
+ throw(errorString);
+ }
+}
+
+void FileReaderAscii::close(){
+ m_ifstream.close();
+ // m_ifstream.clear();
+}
+
+unsigned int FileReaderAscii::nrOfCol(bool checkCols){
+ reset();
+ bool verbose=false;
+ unsigned int totalCol=0;
+ unsigned int nrow=0;
+ if(m_fs>' '&&m_fs<='~'){//field separator is a regular character (minimum
ASCII code is space, maximum ASCII code is tilde)
+ if(verbose)
+ std::cout << "reading csv file " << m_filename << std::endl;
+ std::string csvRecord;
+ while(getline(m_ifstream,csvRecord)){//read a line
+ std::istringstream csvstream(csvRecord);
+ std::string item;
+ int ncol=0;
+ bool isComment=false;
+ while(getline(csvstream,item,m_fs)){//read a column
+ if(verbose)
+ std::cout << item << " ";
+ unsigned pos=item.find(m_comment);
+ if(pos!=std::string::npos){
+ if(pos>0)
+ item=item.substr(0,pos-1);
+ else
+ break;
+ if(verbose)
+ std::cout << "comment found, string is " << item << std::endl;
+ isComment=true;
+ }
+ ++ncol;
+ if(isComment)
+ break;
+ }
+ if(verbose)
+ std::cout << std::endl;
+ if(checkCols){
+ if(totalCol!=ncol){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << "!=" << totalCol << ")" << std::endl;
+ throw(ess.str());
+ }
+ ++nrow;
+ }
+ else
+ break;
+ }
+ }
+ else{//space or tab delimited fields
+ if(verbose)
+ std::cout << "space or tab delimited fields" << std::endl;
+ std::string spaceRecord;
+ while(!getline(m_ifstream, spaceRecord).eof()){
+ if(verbose>1)
+ std::cout << spaceRecord << std::endl;
+ std::istringstream lineStream(spaceRecord);
+ std::string item;
+ int ncol=0;
+ bool isComment=false;
+ while(lineStream >> item){
+ if(verbose)
+ std::cout << item << " ";
+ unsigned pos=item.find(m_comment);
+ if(pos!=std::string::npos){
+ if(pos>0)
+ item=item.substr(0,pos-1);
+ else
+ break;
+ if(verbose)
+ std::cout << "comment found, string is " << item << std::endl;
+ isComment=true;
+ }
+ ++ncol;
+ if(isComment)
+ break;
+ }
+ if(verbose)
+ std::cout << std::endl << "number of columns: " << ncol << std::endl;
+ if(checkCols){
+ if(totalCol!=ncol){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << "!=" << totalCol << ")" << std::endl;
+ throw(ess.str());
+ }
+ }
+ else
+ break;
+ ++nrow;
+ }
+ }
+}
+
+unsigned int FileReaderAscii::nrOfRow(bool checkCols){
+ reset();
+ bool verbose=false;
+ unsigned int totalCol=0;
+ unsigned int nrow=0;
+ unsigned int ncomment=0;
+ if(m_fs>' '&&m_fs<='~'){//field separator is a regular character (minimum
ASCII code is space, maximum ASCII code is tilde)
+ if(verbose)
+ std::cout << "reading csv file " << m_filename << std::endl;
+ std::string csvRecord;
+ while(getline(m_ifstream,csvRecord)){//read a line
+ std::istringstream csvstream(csvRecord);
+ std::string item;
+ int ncol=0;
+ bool isComment=false;
+ while(getline(csvstream,item,m_fs)){//read a column
+ if(verbose)
+ std::cout << item << " ";
+ unsigned pos=item.find(m_comment);
+ if(pos!=std::string::npos){
+ if(pos>0){
+ if(verbose)
+ std::cout << "comment found, string is " << item << std::endl;
+ isComment=true;
+ }
+ else{
+ ++ncomment;
+ break;
+ }
+ }
+ ++ncol;
+ if(isComment)
+ break;
+ }
+ if(verbose)
+ std::cout << std::endl;
+ if(checkCols){
+ if(totalCol!=ncol){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << "!=" << totalCol << ")" << std::endl;
+ throw(ess.str());
+ }
+ }
+ ++nrow;
+ }
+ }
+ else{//space or tab delimited fields
+ if(verbose)
+ std::cout << "space or tab delimited fields" << std::endl;
+ std::string spaceRecord;
+ int totalCol=0;
+ while(!getline(m_ifstream, spaceRecord).eof()){
+ if(verbose>1)
+ std::cout << spaceRecord << std::endl;
+ std::istringstream lineStream(spaceRecord);
+ std::string item;
+ int ncol=0;
+ bool isComment=false;
+ while(lineStream >> item){
+ if(verbose)
+ std::cout << item << " ";
+ unsigned pos=item.find(m_comment);
+ if(pos!=std::string::npos){
+ if(pos>0){
+ if(verbose)
+ std::cout << "comment found, string is " << item << std::endl;
+ isComment=true;
+ }
+ else{
+ ++ncomment;
+ break;
+ }
+ }
+ ++ncol;
+ if(isComment)
+ break;
+ }
+ if(verbose)
+ std::cout << std::endl << "number of columns: " << ncol << std::endl;
+ if(checkCols){
+ if(totalCol!=ncol){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << "!=" << totalCol << ")" << std::endl;
+ throw(ess.str());
+ }
+ ++nrow;
+ }
+ }
+ }
+}
+
diff --git a/src/fileclasses/FileReaderAscii.h
b/src/fileclasses/FileReaderAscii.h
index 2fbf092..c21a270 100644
--- a/src/fileclasses/FileReaderAscii.h
+++ b/src/fileclasses/FileReaderAscii.h
@@ -23,6 +23,7 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
#include <string>
#include <vector>
#include <fstream>
+#include "base/Optionpk.h"
//--------------------------------------------------------------------------
class FileReaderAscii
@@ -32,15 +33,17 @@ public:
FileReaderAscii(const std::string& filename);
FileReaderAscii(const std::string& filename, const char& fieldseparator);
~FileReaderAscii(void);
- void reset(){m_ifstream.clear();m_ifstream.seekg(0,ios::beg);};
+ void reset(){m_ifstream.clear();m_ifstream.seekg(0,std::ios::beg);};
void open(const std::string& filename);
void close(void);
void setFieldSeparator(const char& fieldseparator){m_fs=fieldseparator;};
void setMinRow(int minRow){m_minRow=minRow;};
void setMaxRow(int maxRow){m_maxRow=maxRow;};
void setComment(char comment){m_comment=comment;};
- template<class T> unsigned int readData(vector<vector<T> > &dataVector,
const vector<int> &cols);
- template<class T> unsigned int readData(vector<T> &dataVector, int col);
+ unsigned int nrOfCol(bool checkCols=false);
+ unsigned int nrOfRow(bool checkCols=false);
+ template<class T> unsigned int readData(std::vector<std::vector<T> >
&dataVector, const std::vector<int> &cols, bool verbose=false);
+ template<class T> unsigned int readData(std::vector<T> &dataVector, int col,
bool verbose=false);
protected:
std::string m_filename;
std::ifstream m_ifstream;
@@ -52,50 +55,15 @@ public:
int m_maxRow;
};
-FileReaderAscii::FileReaderAscii(void)
- : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs(' '),m_comment('#'){
-}
-
-FileReaderAscii::FileReaderAscii(const std::string& filename)
- : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs(' '),m_comment('#'){
- open(filename);
-}
-
-FileReaderAscii::FileReaderAscii(const std::string& filename, const char&
fieldseparator)
- : m_min(0),m_max(0),m_minRow(0),m_maxRow(0),m_fs('
'),m_comment(fieldseparator){
- open(filename);
-}
-
-FileReaderAscii::~FileReaderAscii(void)
-{
-}
-
-void FileReaderAscii::open(const std::string& filename){
- m_filename=filename;
- m_ifstream.open(filename.c_str(),ios_base::in);
- if(!(m_ifstream)){
- string errorString;
- errorString="Error: could not open file ";
- errorString+=filename;
- throw(errorString);
- }
-}
-
-void FileReaderAscii::close(){
- m_ifstream.close();
- // m_ifstream.clear();
-}
-
-template<class T> unsigned int FileReaderAscii::readData(vector<T>
&dataVector, int col){
+template<class T> unsigned int FileReaderAscii::readData(std::vector<T>
&dataVector, int col, bool verbose){
reset();
- bool verbose=false;
dataVector.clear();
int nrow=0;
bool withinRange=true;
if(m_fs>' '&&m_fs<='~'){//field separator is a regular character (minimum
ASCII code is space, maximum ASCII code is tilde)
if(verbose)
- cout << "reading csv file " << m_filename << endl;
- string csvRecord;
+ std::cout << "reading csv file " << m_filename << std::endl;
+ std::string csvRecord;
while(getline(m_ifstream,csvRecord)){//read a line
withinRange=true;
if(nrow<m_minRow)
@@ -104,13 +72,13 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
if(nrow>m_maxRow)
withinRange=false;
if(withinRange){
- istringstream csvstream(csvRecord);
- string item;
+ std::istringstream csvstream(csvRecord);
+ std::string item;
int ncol=0;
bool isComment=false;
while(getline(csvstream,item,m_fs)){//read a column
if(verbose)
- cout << item << " ";
+ std::cout << item << " ";
unsigned pos=item.find(m_comment);
if(pos!=std::string::npos){
if(pos>0)
@@ -131,9 +99,12 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
break;
}
if(verbose)
- cout << endl;
- if(dataVector.size())
- assert(ncol>=col);
+ std::cout << std::endl;
+ if(dataVector.size()&&ncol>=col){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << ")" << std::endl;
+ throw(ess.str());
+ }
}
++nrow;
}
@@ -142,7 +113,7 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
else{//space or tab delimited fields
if(verbose)
std::cout << "space or tab delimited fields" << std::endl;
- string spaceRecord;
+ std::string spaceRecord;
while(!getline(m_ifstream, spaceRecord).eof()){
withinRange=true;
if(nrow<m_minRow)
@@ -152,15 +123,15 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
withinRange=false;
if(withinRange){
if(verbose>1)
- cout << spaceRecord << endl;
- istringstream lineStream(spaceRecord);
- string item;
+ std::cout << spaceRecord << std::endl;
+ std::istringstream lineStream(spaceRecord);
+ std::string item;
int ncol=0;
bool isComment=false;
while(lineStream >> item){
if(verbose)
- cout << item << " ";
- // istringstream itemStream(item);
+ std::cout << item << " ";
+ // std::istringstream itemStream(item);
unsigned pos=item.find(m_comment);
if(pos!=std::string::npos){
if(pos>0)
@@ -181,11 +152,14 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
break;
}
if(verbose>1)
- cout << endl;
+ std::cout << std::endl;
if(verbose)
- cout << "number of columns: " << ncol << endl;
- if(dataVector.size())
- assert(ncol>=col);
+ std::cout << "number of columns: " << ncol << std::endl;
+ if(dataVector.size()&&ncol>=col){
+ std::ostringstream ess;
+ ess << "Error: different number of cols found in line " << nrow << "
(" << ncol << ")" << std::endl;
+ throw(ess.str());
+ }
}
++nrow;
}
@@ -193,17 +167,16 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<T> &dataVector,
return dataVector.size();
}
-template<class T> unsigned int FileReaderAscii::readData(vector<vector<T> >
&dataVector, const vector<int> &cols){
+template<class T> unsigned int
FileReaderAscii::readData(std::vector<std::vector<T> > &dataVector, const
std::vector<int> &cols, bool verbose){
reset();
- bool verbose=false;
dataVector.clear();
dataVector.resize(cols.size());
int nrow=0;
bool withinRange=true;
if(m_fs>' '&&m_fs<='~'){//field separator is a regular character (minimum
ASCII code is space, maximum ASCII code is tilde)
if(verbose)
- cout << "reading csv file " << m_filename << endl;
- string csvRecord;
+ std::cout << "reading csv file " << m_filename << std::endl;
+ std::string csvRecord;
while(getline(m_ifstream,csvRecord)){//read a line
withinRange=true;
if(nrow<m_minRow)
@@ -212,13 +185,13 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<vector<T> > &dat
if(nrow>m_maxRow)
withinRange=false;
if(withinRange){
- istringstream csvstream(csvRecord);
- string item;
+ std::istringstream csvstream(csvRecord);
+ std::string item;
int ncol=0;
bool isComment=false;
while(getline(csvstream,item,m_fs)){//read a column
if(verbose)
- cout << item << " ";
+ std::cout << item << " ";
unsigned pos=item.find(m_comment);
if(pos!=std::string::npos){
if(pos>0)
@@ -241,7 +214,7 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<vector<T> > &dat
break;
}
if(verbose)
- cout << endl;
+ std::cout << std::endl;
if(dataVector.back().size())
assert(ncol>=cols[0]);
}
@@ -252,7 +225,7 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<vector<T> > &dat
else{//space or tab delimited fields
if(verbose)
std::cout << "space or tab delimited fields" << std::endl;
- string spaceRecord;
+ std::string spaceRecord;
while(!getline(m_ifstream, spaceRecord).eof()){
withinRange=true;
if(nrow<m_minRow)
@@ -262,15 +235,15 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<vector<T> > &dat
withinRange=false;
if(withinRange){
if(verbose>1)
- cout << spaceRecord << endl;
- istringstream lineStream(spaceRecord);
- string item;
+ std::cout << spaceRecord << std::endl;
+ std::istringstream lineStream(spaceRecord);
+ std::string item;
int ncol=0;
bool isComment=false;
while(lineStream >> item){
if(verbose)
- cout << item << " ";
- // istringstream itemStream(item);
+ std::cout << item << " ";
+ // std::istringstream itemStream(item);
unsigned pos=item.find(m_comment);
if(pos!=std::string::npos){
if(pos>0)
@@ -293,9 +266,9 @@ template<class T> unsigned int
FileReaderAscii::readData(vector<vector<T> > &dat
break;
}
if(verbose>1)
- cout << endl;
+ std::cout << std::endl;
if(verbose)
- cout << "number of columns: " << ncol << endl;
+ std::cout << "number of columns: " << ncol << std::endl;
if(dataVector.back().size())
assert(ncol>=cols[0]);
}
diff --git a/src/fileclasses/Makefile.am b/src/fileclasses/Makefile.am
index 88fcd4e..7d95c69 100644
--- a/src/fileclasses/Makefile.am
+++ b/src/fileclasses/Makefile.am
@@ -6,17 +6,23 @@ AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
###############################################################################
# the library names to build (note we are building static libs only)
-noinst_LIBRARIES = libfileClasses.a
-#lib_LTLIBRARIES = libfileClasses.la
+#noinst_LIBRARIES = libfileClasses.a
+lib_LTLIBRARIES = libfileClasses.la
+
# where to install the headers on the system
-libfileClasses_adir = $(includedir)/fileclasses
-libfileClasses_a_HEADERS = FileReaderAscii.h
+libfileClasses_ladir = $(includedir)/fileclasses
+
+# the list of header files that belong to the library (to be installed later)
+libfileClasses_la_HEADERS = FileReaderAscii.h
+
+# the sources to add to the library and to add to the source distribution
+libfileClasses_la_SOURCES = $(libfileClasses_a_HEADERS) FileReaderAscii.cc
if USE_LAS
# the list of header files that belong to the library (to be installed later)
-libfileClasses_a_HEADERS += FileReaderLas.h
+libfileClasses_la_HEADERS += FileReaderLas.h
# the sources to add to the library and to add to the source distribution
-libfileClasses_a_SOURCES = $(libfileClasses_a_HEADERS) FileReaderLas.cc
+libfileClasses_la_SOURCES += FileReaderLas.h FileReaderLas.cc
endif
###############################################################################
diff --git a/src/models/Makefile.am b/src/models/Makefile.am
index 32507c6..36cb684 100644
--- a/src/models/Makefile.am
+++ b/src/models/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = pktestProspect
# the library names to build (note we are building static libs only)
#noinst_LIBRARIES = libmodels.a
-lib_LTLIBRARIES = libmodels.la libprospect.la
+lib_LTLIBRARIES = libprospect.la libmodels.la
# where to install the headers on the system
libmodels_ladir = $(includedir)/models
@@ -29,6 +29,8 @@ endif
# the sources to add to the library and to add to the source distribution
libmodels_la_SOURCES = $(libmodels_la_HEADERS) Prospect.cc
+libmodels_la_LIBADD = $(top_builddir)/src/models/libprospect.la
+
libprospect_la_SOURCES = dataSpec_P5B.f90 prospect_5B.f90 tav_abs.f90
###############################################################################
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
