Updated configuration, version 0.1pre

knodlseder
1 parent ebbe02cd
Showing 15 changed files with 1199 additions and 453 deletions
INSTALL
Makefile.in
configure
configure.ac
src/GSparseMatrix.cpp
src/GSparseMatrix.hpp
src/Makefile.am
src/Makefile.in
test/Makefile.am
test/Makefile.in
test/test_GMatrix.hpp
test/test_GSparseMatrix.cpp
test/test_GSparseMatrix.hpp
test/test_GSymMatrix.hpp
test/test_GVector.hpp
-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+GammaLib - Gamma-Ray Astronomy Library
+======================================
  
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+Installation Instructions
+=========================
+
+GammaLib follows the standard GNU installation procedure.  To compile
+GammaLib you will need an ANSI C++-compiler.  After unpacking the
+distribution the Makefiles can be prepared using the configure command,
+
+  ./configure
+
+You can then build the library by typing,
+
+  make
+
+Both static and shared versions of the libraries will be compiled by
+default.  Compilation of shared libraries can be turned off by
+specifying the `--disable-shared' option to `configure', e.g.
+  
+  ./configure --disable-shared
+
+If you encounter problems building the library try using the above
+option, because some platforms do not support shared libraries.
+
+An extensive test suite is available.  After compiling the library
+with "make", it can be invoked with "make check" at the top level.
+The test output should be directed to a file rather than a terminal,
+with the command,
+
+
+   make check > log 2>&1
+
+to allow any errors to be examined in detail.
+
+The library can be installed using the command,
+
+  make install
+
+The default installation directory prefix is /usr/local.  Consult the
+"Further Information" section below for instructions on installing the
+library in another location or changing other default compilation
+options.
  
-Basic Installation
-==================
  
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
+OPTIONS TO CONFIGURE SCRIPT:
+============================
+
+Apart form the further down mentioned options, the following
+options can be used:
+
+--enable-range-check       performs index range checking (slower code)
+
+
+For example, if index range checking should be performed, use
+
+./configure --enable-range-check
+
  
 Compilers and Options
 =====================
@@ -79,6 +72,7 @@ is an example:
  
    *Note Defining Variables::, for more details.
  
+
 Compiling For Multiple Architectures
 ====================================
  
@@ -96,6 +90,7 @@ time in the source code directory.  After you have installed the
 package for one architecture, use `make distclean' before reconfiguring
 for another architecture.
  
+
 Installation Names
 ==================
  
@@ -119,6 +114,7 @@ you can set and what kinds of files go in them.
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
  
+
 Optional Features
 =================
  
@@ -134,6 +130,7 @@ find the X include and library files automatically, but if it doesn&#39;t,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
  
+
 Specifying the System Type
 ==========================
  
@@ -164,6 +161,7 @@ platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
 eventually be run) with `--host=TYPE'.
  
+
 Sharing Defaults
 ================
  
@@ -175,6 +173,7 @@ default values for variables like `CC&#39;, `cache_file&#39;, and `prefix&#39;.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
  
+
 Defining Variables
 ==================
  
@@ -189,8 +188,9 @@ them in the `configure&#39; command line, using `VAR=value&#39;.  For example:
 will cause the specified gcc to be used as the C compiler (unless it is
 overridden in the site shell script).
  
-`configure' Invocation
-======================
+
+Operation Controls
+==================
  
    `configure' recognizes the following options to control how it
 operates.
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
  
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  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.
@@ -13,124 +13,189 @@
 # PARTICULAR PURPOSE.
  
 @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@
 pkgincludedir = $(includedir)/@PACKAGE@
 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@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+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
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(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 configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
+FFLAGS = @FFLAGS@
+GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
-MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+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@
 RANLIB = @RANLIB@
-RC = @RC@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
+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@
+datadir = @datadir@
+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@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 SUBDIRS = src test
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-	Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \
-	configure configure.ac install-sh ltmain.sh missing \
-	mkinstalldirs
-DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
 .SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps'; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	  $(AUTOMAKE) --gnu  --ignore-deps 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
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
  
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
 config.h: stamp-h1
@@ -142,10 +207,10 @@ config.h: stamp-h1
 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: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+	rm -f stamp-h1
+	touch $@
  
 distclean-hdr:
 	-rm -f config.h stamp-h1
@@ -214,11 +279,10 @@ tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
  
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -228,14 +292,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
  
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	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 && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -244,8 +317,24 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	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; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
  
 GTAGS:
@@ -254,29 +343,23 @@ GTAGS:
 	  && gtags -i $(GTAGS_ARGS) $$here
  
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distcleancheck_listfiles = find . -type f -print
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@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,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -291,15 +374,17 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -310,26 +395,54 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(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
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	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
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
-	  && cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -337,23 +450,40 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-	      || { echo "ERROR: files left after uninstall:" ; \
-	           find $$dc_install_base -type f -print ; \
-	           exit 1; } >&2 ) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
-	  && rm -f $(distdir).tar.gz \
+	  && $(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
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { 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 \
+	@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 after distclean:" ; \
+	@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
@@ -361,7 +491,6 @@ 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
@@ -373,7 +502,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -381,7 +510,7 @@ mostlyclean-generic:
 clean-generic:
  
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -392,13 +521,16 @@ clean-am: clean-generic clean-libtool mostlyclean-am
  
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
  
 dvi: dvi-recursive
  
 dvi-am:
  
+html: html-recursive
+
 info: info-recursive
  
 info-am:
@@ -415,32 +547,40 @@ installcheck-am:
  
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-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: uninstall-info-am
  
 uninstall-info: uninstall-info-recursive
  
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive dist dist-all \
-	dist-gzip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags \
-	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-libtool clean-recursive \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-recursive distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-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 \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-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.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gamma 0.1.
+# Generated by GNU Autoconf 2.59 for GammaLib 0.1pre.
 #
 # Report bugs to <knodlseder@cesr.fr>.
 #
@@ -421,13 +421,13 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
  
 # Identity of this package.
-PACKAGE_NAME='gamma'
-PACKAGE_TARNAME='gamma'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='gamma 0.1'
+PACKAGE_NAME='GammaLib'
+PACKAGE_TARNAME='gammalib'
+PACKAGE_VERSION='0.1pre'
+PACKAGE_STRING='GammaLib 0.1pre'
 PACKAGE_BUGREPORT='knodlseder@cesr.fr'
  
-ac_unique_file="src/GException.hpp"
+ac_unique_file="src/GammaLib.hpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -465,7 +465,7 @@ ac_includes_default=&quot;\
 # include <unistd.h>
 #endif"
  
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT GAMMALIB_LT_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
  
 # Initialize some variables set by options.
@@ -954,7 +954,7 @@ if test &quot;$ac_init_help&quot; = &quot;long&quot;; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gamma 0.1 to adapt to many kinds of systems.
+\`configure' configures GammaLib 0.1pre to adapt to many kinds of systems.
  
 Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@ -1020,15 +1020,13 @@ fi
  
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gamma 0.1:";;
+     short | recursive ) echo "Configuration of GammaLib 0.1pre:";;
    esac
   cat <<\_ACEOF
  
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
   --enable-shared[=PKGS]
                           build shared libraries [default=yes]
   --enable-static[=PKGS]
@@ -1159,7 +1157,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-gamma configure 0.1
+GammaLib configure 0.1pre
 generated by GNU Autoconf 2.59
  
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1173,7 +1171,7 @@ cat &gt;&amp;5 &lt;&lt;_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
  
-It was created by gamma $as_me 0.1, which was
+It was created by GammaLib $as_me 0.1pre, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
  
   $ $0 $@
@@ -1509,7 +1507,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
-# AC_CONFIG_SRCDIR(src/gammalib.hpp)
  
  
 am__api_version="1.9"
@@ -1818,8 +1815,8 @@ fi
  
  
 # Define the identity of the package.
- PACKAGE='gamma'
- VERSION='0.1'
+ PACKAGE='gammalib'
+ VERSION='0.1pre'
  
  
 cat >>confdefs.h <<_ACEOF
@@ -1951,30 +1948,7 @@ am__tar=&#39;${AMTAR} chof - &quot;$$tardir&quot;&#39;; am__untar=&#39;${AMTAR} xf -&#39;
  
           ac_config_headers="$ac_config_headers config.h"
  
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
+#AM_MAINTAINER_MODE
  
 # things required by automake
 # AC_ARG_PROGRAM
@@ -2568,6 +2542,98 @@ ac_compile=&#39;$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5&#39;
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+# AC_LANG(C)
+# AC_PROG_CC
+# AC_PROG_CPP
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+# AC_PROG_LN_S
+
+# Library versioning (current:revision:age)
+# See the libtool manual for an explanation
+#
+# gammalib-0.1     libgamma 0:0:0
+GAMMALIB_LT_VERSION="0:0:0"
+
+
+# libtool test.
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -3905,7 +3971,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3908 "configure"' > conftest.$ac_ext
+  echo '#line 3974 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5013,7 +5079,7 @@ fi
  
  
 # Provide some information about the compiler.
-echo "$as_me:5016:" \
+echo "$as_me:5082:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6047,11 +6113,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6050: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6116: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6054: \$? = $ac_status" >&5
+   echo "$as_me:6120: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6280,11 +6346,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6349: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6287: \$? = $ac_status" >&5
+   echo "$as_me:6353: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6340,11 +6406,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6343: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6409: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6347: \$? = $ac_status" >&5
+   echo "$as_me:6413: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7674,7 +7740,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 7677 "configure"' > conftest.$ac_ext
+    echo '#line 7743 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8545,7 +8611,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8548 "configure"
+#line 8614 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -8643,7 +8709,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8646 "configure"
+#line 8712 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -10822,11 +10888,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10825: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10891: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10829: \$? = $ac_status" >&5
+   echo "$as_me:10895: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10882,11 +10948,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10885: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10889: \$? = $ac_status" >&5
+   echo "$as_me:10955: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11393,7 +11459,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 11396 "configure"' > conftest.$ac_ext
+    echo '#line 11462 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12264,7 +12330,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12267 "configure"
+#line 12333 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -12362,7 +12428,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12365 "configure"
+#line 12431 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -13189,11 +13255,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13192: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13258: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13196: \$? = $ac_status" >&5
+   echo "$as_me:13262: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13249,11 +13315,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13252: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13318: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13256: \$? = $ac_status" >&5
+   echo "$as_me:13322: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14563,7 +14629,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14566 "configure"' > conftest.$ac_ext
+    echo '#line 14632 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15304,11 +15370,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15307: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15373: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15311: \$? = $ac_status" >&5
+   echo "$as_me:15377: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15537,11 +15603,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15606: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15544: \$? = $ac_status" >&5
+   echo "$as_me:15610: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15597,11 +15663,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15600: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15666: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15604: \$? = $ac_status" >&5
+   echo "$as_me:15670: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16931,7 +16997,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 16934 "configure"' > conftest.$ac_ext
+    echo '#line 17000 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17802,7 +17868,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17805 "configure"
+#line 17871 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -17900,7 +17966,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17903 "configure"
+#line 17969 "configure"
 #include "confdefs.h"
  
 #if HAVE_DLFCN_H
@@ -18915,23 +18981,30 @@ LIBTOOL=&#39;$(SHELL) $(top_builddir)/libtool&#39;
  
  
  
-# AC_LANG(C)
-# AC_PROG_CC
-# AC_PROG_CPP
-# AC_PROG_INSTALL
-# AC_PROG_LN_S
-
-# Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
+# Check compiler features
 # AC_TYPE_SIZE_T
 # AC_C_CONST
 # AC_C_VOLATILE
 # AC_C_INLINE
  
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+# Check for range cheking option.
+#RANGE_CHECK="no"
+#AC_ARG_ENABLE(range_check,
+#             [  --enable-range-check    performs index range checking],
+#             [ RANGE_CHECK="$enableval"
+#             ])
+#if test "x$RANGE_CHECK" = "xyes"; then
+#        AC_DEFINE([G_RANGE_CHECK], [1],
+#        [Define if range checking should be performed])
+#fi
  
+#
                               ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile"
  
 cat >confcache <<\_ACEOF
@@ -19025,13 +19098,6 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
  
  
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
  
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -19303,7 +19369,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
  
-This file was extended by gamma $as_me 0.1, which was
+This file was extended by GammaLib $as_me 0.1pre, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
  
   CONFIG_FILES    = $CONFIG_FILES
@@ -19363,7 +19429,7 @@ _ACEOF
  
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gamma config.status 0.1
+GammaLib config.status 0.1pre
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
@@ -19576,9 +19642,6 @@ s,@am__leading_dot@,$am__leading_dot,;t t
 s,@AMTAR@,$AMTAR,;t t
 s,@am__tar@,$am__tar,;t t
 s,@am__untar@,$am__untar,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
 s,@CXX@,$CXX,;t t
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -19586,6 +19649,7 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
+s,@GAMMALIB_LT_VERSION@,$GAMMALIB_LT_VERSION,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t
@@ -19610,7 +19674,6 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
+#
 # Process this file with autoconf to produce a configure script.
-
-AC_INIT([gamma], [0.1], [knodlseder@cesr.fr])
-# AC_CONFIG_SRCDIR(src/gammalib.hpp)
-AC_CONFIG_SRCDIR(src/GException.hpp)
+#
+AC_INIT([GammaLib], [0.1pre], [knodlseder@cesr.fr])
+AC_CONFIG_SRCDIR(src/GammaLib.hpp)
  
 AM_INIT_AUTOMAKE([gnu no-dependencies])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+#AM_MAINTAINER_MODE
  
 # things required by automake
 # AC_ARG_PROGRAM
@@ -17,24 +17,45 @@ AC_PROG_MAKE_SET
  
 # Checks for programs.
 AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
 # AC_LANG(C)
 # AC_PROG_CC
 # AC_PROG_CPP
-# AC_PROG_INSTALL
+AC_PROG_INSTALL
 # AC_PROG_LN_S
  
-# Checks for libraries.
+# Library versioning (current:revision:age)
+# See the libtool manual for an explanation
+#
+# gammalib-0.1     libgamma 0:0:0
+GAMMALIB_LT_VERSION="0:0:0"
+AC_SUBST(GAMMALIB_LT_VERSION)
  
-# Checks for header files.
+# libtool test.
+AC_PROG_LIBTOOL
  
-# Checks for typedefs, structures, and compiler characteristics.
+# Check compiler features
 # AC_TYPE_SIZE_T
 # AC_C_CONST
 # AC_C_VOLATILE
 # AC_C_INLINE
  
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+# Check for range cheking option.
+#RANGE_CHECK="no"
+#AC_ARG_ENABLE(range_check, 
+#             [  --enable-range-check    performs index range checking], 
+#             [ RANGE_CHECK="$enableval"
+#             ]) 
+#if test "x$RANGE_CHECK" = "xyes"; then
+#        AC_DEFINE([G_RANGE_CHECK], [1], 
+#        [Define if range checking should be performed])
+#fi
  
+#
 AC_CONFIG_FILES([Makefile src/Makefile test/Makefile])
 AC_OUTPUT
@@ -30,6 +30,7 @@ using namespace std;
 /* __ Debug definitions __________________________________________________ */
 //#define G_DEBUG_SPARSE_PENDING                    // Analyse pending values
 //#define G_DEBUG_SPARSE_INSERTION                 // Analyse value insertion
+//#define G_DEBUG_SPARSE_ADDITION                 // Analyse value addition
 //#define G_DEBUG_SPARSE_COMPRESSION   // Analyse zero row/column compression
 //#define G_DEBUG_SPARSE_MALLOC                  // Analyse memory management
 //#define G_DEBUG_SPARSE_STACK_PUSH           // Analyse stack column pushing
@@ -650,6 +651,10 @@ GVector GSparseMatrix::extract_col(int col) const
  
 /***************************************************************************
  *                      Insert vector column into matrix                   *
+ * ----------------------------------------------------------------------- *
+ * This is the main driver routine to insert data into a matrix. Note that *
+ * there is another instance of this function that takes a compressed      *
+ * array.                                                                  *
  ***************************************************************************/
 void GSparseMatrix::insert_col(const GVector& v, int col)
 {
@@ -712,7 +717,7 @@ void GSparseMatrix::insert_col(const GVector&amp; v, int col)
   // increase the matrix size).
   int n_diff = n_vector - n_exist;
  
-  // If we need space then allocate it, if we have to much space the free it
+  // If we need space then allocate it, if we have to much space then free it
   if (n_diff > 0) {
 	alloc_elements(i_start, n_diff);
 	#if defined(G_DEBUG_SPARSE_INSERTION)
@@ -761,14 +766,154 @@ void GSparseMatrix::insert_col(const GVector&amp; v, int col)
  
  
 /***************************************************************************
+ *                    Insert compressed array into matrix                  *
+ * ----------------------------------------------------------------------- *
+ * This is the main driver routine to insert data into a matrix. Note that *
+ * there is another instance of this function that takes a vector.         *
+ ***************************************************************************/
+void GSparseMatrix::insert_col(const double* values, const int* rows, 
+                               int number, int col)
+{
+  // Debug header
+  #if defined(G_DEBUG_SPARSE_INSERTION)
+  cout << "GSparseMatrix::insert_col(v, i, n, " << col << "):" << endl;
+  cout << " Matrix Data : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " Matrix Row .: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " Matrix Col .: ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  cout << " Array Data .: ";
+  for (int i = 0; i < number; ++i)
+	cout << values[i] << " ";
+  cout << endl << " Array Row ..: ";
+  for (int i = 0; i < number; ++i)
+	cout << rows[i] << " ";
+  cout << endl;
+  #endif
+  
+  // Raise an exception if the column index is invalid
+  #if defined(G_RANGE_CHECK)
+  if (col >= m_cols)
+    throw out_of_range("GSparseMatrix::insert_col(const double*, const int*, int, int)", 
+	                   0, col, m_rows, m_cols);
+  #endif
+
+  // Raise an exception if the index array seems incompatible with matrix 
+  // dimensions
+  if (rows[number-1] >= m_rows)
+    throw matrix_vector_mismatch("GSparseMatrix::insert_col(const GVector&, int)", 
+	                             rows[number-1], m_rows, m_cols);
+
+  // If there is a pending element for this column then delete it since
+  // the vector overwrites this element
+  if (m_fill_val != 0.0 && m_fill_col == col) {
+    #if defined(G_DEBUG_SPARSE_PENDING)
+    cout << "GSparseMatrix::insert_col(const GVector&, int): pending value " <<
+	        m_fill_val << " for location (" << m_fill_row << "," << m_fill_col << 
+		    ") became obsolete" << endl;
+	#endif
+    m_fill_val = 0.0;
+	m_fill_row = 0;
+	m_fill_col = 0;
+  }
+
+  // Get the start and stop indices of the actual column and compute
+  // the number of exisiting elements in the column
+  int i_start = m_colstart[col];
+  int i_stop  = m_colstart[col+1];
+  int n_exist = i_stop - i_start;
+
+  // If the array is empty then make sure that the number of elements is 0 
+  // (we then just delete the existing column)
+  if (!values || !rows)
+	number = 0;
+	
+  // Compute the size difference for the new matrix. It is positive if
+  // the number of non-zero entries in the array is larger than the
+  // number of non-zero entries in the matrix (in this case we have to
+  // increase the matrix size).
+  int n_diff = number - n_exist;
+	
+  // If we need space then allocate it, if we have to much space then free it
+  if (n_diff > 0) {
+	alloc_elements(i_start, n_diff);
+	#if defined(G_DEBUG_SPARSE_INSERTION)
+    cout << " Insert .: " << n_diff << " elements at index " << i_start << endl;
+    #endif
+  }
+  else if (n_diff < 0) {
+	free_elements(i_start, -n_diff);
+	#if defined(G_DEBUG_SPARSE_INSERTION)
+    cout << " Remove .: " << -n_diff << " elements at index " << i_start << endl;
+    #endif
+  }
+	  
+  // Insert the array elements into the matrix
+  if (number > 0) {
+    for (int row = 0, i = i_start; row < number; ++row, ++i) {
+	  m_data[i]   = values[row];
+	  m_rowinx[i] = rows[row];
+    }
+  }
+	
+  // Update column start indices
+  for (int i = col+1; i <= m_cols; ++i)
+	m_colstart[i] += n_diff;
+
+  // Debugging: show sparse matrix after insertion
+  #if defined(G_DEBUG_SPARSE_INSERTION)
+  cout << " Out Data: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " Out Row : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " Out Col : ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  #endif
+  
+  // Return
+  return;
+}
+
+
+/***************************************************************************
  *                         Add vector to matrix column                     *
+ * ----------------------------------------------------------------------- *
+ * This is the main driver routine to add data to a matrix. It handles     *
+ * both normal and stack-based filled. Note that there is another instance *
+ * of this function that takes a compressed array.                         *
  ***************************************************************************/
 void GSparseMatrix::add_col(const GVector& v, int col)
 {
+  // Debug header
+  #if defined(G_DEBUG_SPARSE_ADDITION)
+  cout << "GSparseMatrix::add_col([" << v << "], " << col << "):" << endl;
+  cout << " In Data : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " In Row .: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " In Col .: ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  #endif
+
   // Initialise number of non-zero elements to 0
   int non_zero = 0;
  
-  // If we have a stack then try to push elements on stack first ...
+  // If we have a stack then try to push vector on stack first. Note that
+  // stack_push_column does its own argument verifications, so to avoid
+  // double checking we don't do anything before this call ...
   if (m_stack_data != NULL) {
     non_zero = stack_push_column(v, col);
 	if (non_zero == 0)
@@ -812,9 +957,22 @@ void GSparseMatrix::add_col(const GVector&amp; v, int col)
  
 	// Insert vector into matrix
     insert_col(column, col);
-	
-	  
+
   }
+
+  // Debugging: show sparse matrix after addition
+  #if defined(G_DEBUG_SPARSE_ADDITION)
+  cout << " Out Data: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " Out Row : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " Out Col : ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  #endif
  
   // Return
   return;
@@ -822,6 +980,152 @@ void GSparseMatrix::add_col(const GVector&amp; v, int col)
  
  
 /***************************************************************************
+ *                   Add compressed array to matrix column                 *
+ * ----------------------------------------------------------------------- *
+ * This is the main driver routine to add data to a matrix. It handles     *
+ * both normal and stack-based filled. Note that there is another instance *
+ * of this function that takes a vector.                                   *
+ ***************************************************************************/
+void GSparseMatrix::add_col(const double* values, const int* rows, 
+                            int number, int col)
+{
+  // Debug header
+  #if defined(G_DEBUG_SPARSE_ADDITION)
+  cout << "GSparseMatrix::add_col(v, i, n, " << col << "):" << endl;
+  cout << " Matrix Data : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " Matrix Row .: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " Matrix Col .: ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  cout << " Array Data .: ";
+  for (int i = 0; i < number; ++i)
+	cout << values[i] << " ";
+  cout << endl << " Array Row ..: ";
+  for (int i = 0; i < number; ++i)
+	cout << rows[i] << " ";
+  cout << endl;
+  #endif
+
+  // If we have a stack then try to push elements on stack first. Note that
+  // stack_push_column does its own argument verifications, so to avoid
+  // double checking we don't do anything before this call ...
+  if (m_stack_data != NULL) {
+    number = stack_push_column(values, rows, number, col);
+	if (number == 0)
+	  return;
+  }
+   
+  // ... otherwise check the arguments
+  else {
+    // If the array is empty there is nothing to do
+    if (!values || !rows || (number < 1))
+      return;
+
+    // Raise an exception if the column index is invalid
+    #if defined(G_RANGE_CHECK)
+    if (col >= m_cols)
+      throw out_of_range("GSparseMatrix::add_col(const double*, const int*, int, int)", 
+	                     0, col, m_rows, m_cols);
+    #endif
+
+    // Raise an exception if the index array seems incompatible with matrix 
+    // dimensions
+    if (rows[number-1] >= m_rows)
+      throw matrix_vector_mismatch("GSparseMatrix::add_col(const double*, const int*, int, int)", 
+	                               rows[number-1], m_rows, m_cols);
+  } // endelse: there was no stack
+
+  // Get indices of column in matrix
+  int i_start = m_colstart[col];
+  int i_stop  = m_colstart[col+1];
+
+  // Case A: the column exists in the matrix, so mix new elements with existing
+  // data
+  if (i_start < i_stop) {
+  
+    // Allocate workspace to hold combined column
+    int     wrk_size   = number + i_stop - i_start;
+	double* wrk_double = new double[wrk_size];
+    int*    wrk_int    = new int[wrk_size];
+    if (wrk_double == NULL || wrk_int == NULL)
+	  throw mem_alloc("GSparseMatrix::add_col(const double*, const int*, int, int)", 
+	                  wrk_size);
+
+    // Mix values while both are alive
+	int k     = 0;
+	int index = 0;
+	int row_m = m_rowinx[i_start];
+	int row_s = rows[k];
+	while (i_start < i_stop && k < number) {
+	  if (row_m == row_s) {                      // Case A: element in matrix and array
+	    wrk_double[index] = m_data[i_start] + values[k];
+		wrk_int[index]    = row_m;
+		row_m             = m_rowinx[++i_start];
+		row_s             = rows[++k];
+	  }
+	  else if (row_m < row_s) {                  // Case B: element in matrix only
+		wrk_double[index] = m_data[i_start];
+		wrk_int[index]    = row_m;
+		row_m             = m_rowinx[++i_start];
+	  }
+	  else {                                     // Case C: element in array only
+		wrk_double[index] = values[k];
+		wrk_int[index]    = row_s;
+		row_s             = rows[++k];
+	  } 
+	  index++;
+	} // endwhile: mixing
+
+	// Add remaining matrix elements if still alive
+	for (int i = i_start; i < i_stop; ++i) {
+	  wrk_double[index] = m_data[i];
+	  wrk_int[index++]  = m_rowinx[i];
+	}
+
+	// Add remaining array elements if still alive
+	for (int k2 = k; k2 < number; ++k2) {
+	  wrk_double[index] = values[k2];
+	  wrk_int[index++]  = rows[k2];
+	}
+
+    // Insert mixed column
+    insert_col(wrk_double, wrk_int, index, col);
+
+    // Free workspace
+	delete [] wrk_int;
+	delete [] wrk_double;
+  
+  } // endif: Case A
+  
+  // Case B: the column does not yet exist in the matrix, so just insert it
+  else
+    insert_col(values, rows, number, col);
+
+  // Debugging: show sparse matrix after insertion
+  #if defined(G_DEBUG_SPARSE_ADDITION)
+  cout << " Out Data: ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_data[i] << " ";
+  cout << endl << " Out Row : ";
+  for (int i = 0; i < m_elements; ++i)
+	cout << m_rowinx[i] << " ";
+  cout << endl << " Out Col : ";
+  for (int i = 0; i < m_cols+1; ++i)
+	cout << m_colstart[i] << " ";
+  cout << endl;
+  #endif
+
+  // Return
+  return;
+}
+
+
+/***************************************************************************
  *                       Convert matrix into full matrix                   *
  ***************************************************************************/
 GMatrix GSparseMatrix::convert_to_full() const
@@ -1228,7 +1532,7 @@ int GSparseMatrix::stack_push_column(const GVector&amp; v, int col)
     throw matrix_vector_mismatch("GSparseMatrix::stack_push_column(const GVector&, int)", 
 	                             v.m_num, m_rows, m_cols);
  
-  // Determines how many elements should be stored in stack
+  // Determine how many elements should be stored in stack
   int elements = 0;
   for (int i = 0; i < v.m_num; ++i) {
     if (v.m_data[i] != 0.0)
@@ -1301,6 +1605,91 @@ int GSparseMatrix::stack_push_column(const GVector&amp; v, int col)
  
  
 /***************************************************************************
+ *                Push a compressed array on the matrix stack              *
+ * ----------------------------------------------------------------------- *
+ * The return value indicates if the vector was successfully pushed onto   *
+ * the stack (=0) or if the elements need to be added directly (in this    *
+ * case the return value equals to the number of non-zero elements in the  *
+ * vector.                                                                 *
+ ***************************************************************************/
+int GSparseMatrix::stack_push_column(const double* values, const int* rows,
+                                     int number, int col)
+{
+  // If the array is empty there is nothing to do
+  if (!values || !rows || (number < 1))
+    return 0;
+
+  // If there is no stack or the stack can not hold the requested number of 
+  // elements then report number of array elements to the caller
+  if (m_stack_data == NULL || number > m_stack_size)
+    return number;
+
+  // Raise an exception if the column index is invalid
+  #if defined(G_RANGE_CHECK)
+  if (col >= m_cols)
+    throw out_of_range("GSparseMatrix::stack_push_column(const double*, const int*, int, int)", 0, col, m_rows, m_cols);
+  #endif
+
+  // Raise an exception if the index array seems incompatible with matrix 
+  // dimensions
+  if (rows[number-1] >= m_rows)
+    throw matrix_vector_mismatch("GSparseMatrix::stack_push_column(const double*, const int*, int, int)", rows[number-1], m_rows, m_cols);
+
+  // If the specified column is already in the stack then flush stack (we don't
+  // allow the same column twice)
+  for (int i = 0; i < m_stack_entries; ++i) {
+    if (col == m_stack_colinx[i]) {
+      stack_flush();
+	  break;
+	}
+  }
+	
+  // If the stack is full then flush it before pushing the array onto it
+  if ((m_stack_entries >= m_stack_max_entries) ||
+      (number          >= (m_stack_size - m_stack_start[m_stack_entries])))
+	stack_flush();
+
+  // Push the array on the stack
+  int inx = m_stack_start[m_stack_entries];
+  for (int i = 0; i < number; ++i) {
+	m_stack_data[inx]   = values[i];
+	m_stack_rowinx[inx] = rows[i];
+	inx++;
+  }
+  
+  // Store entry information and initialise start of next entry
+  m_stack_colinx[m_stack_entries] = col;     // Store column index for entry
+  m_stack_entries++;                         // Increase the # of entries
+  m_stack_start[m_stack_entries] = inx;      // Set start pointer for next entry
+
+  // Debug: show stack information  
+  #if defined(G_DEBUG_SPARSE_STACK_PUSH)
+  cout << "GSparseMatrix::stack_push_column(v, i, n, col=" << col << ")" << endl;
+  cout << " Number of entries: " << m_stack_entries << endl;
+  cout << " Entry columns ...:";
+  for (int i = 0; i < m_stack_entries; ++i)
+    cout << " " << m_stack_colinx[i];
+  cout << endl;
+  cout << " Entry starts ....:";
+  for (int i = 0; i < m_stack_entries; ++i)
+    cout << " " << m_stack_start[i];
+  cout << " (next at " << m_stack_start[m_stack_entries] << ")" << endl;
+  cout << " Stack data ......:";
+  for (int i = 0; i < m_stack_start[m_stack_entries]; ++i)
+    cout << " " << m_stack_data[i];
+  cout << endl;
+  cout << " Stack rows ......:";
+  for (int i = 0; i < m_stack_start[m_stack_entries]; ++i)
+    cout << " " << m_stack_rowinx[i];
+  cout << endl;
+  #endif
+	  
+  // Return success
+  return 0;
+}
+
+
+/***************************************************************************
  *                              Flush matrix stack                         *
  * ----------------------------------------------------------------------- *
  * Adds the stack to the actual matrix. First, the total number of matrix  *
@@ -1363,29 +1752,32 @@ void GSparseMatrix::stack_flush(void)
 	  int k_stop  = m_stack_start[entry+1];
 	  int row_m   = m_rowinx[i_start];
 	  int row_s   = m_stack_rowinx[k_start];
-	  if (k_start < k_stop && i_start < i_stop) {
-	  	wrk_int[col] = -(entry+2);                 // Flag that we have to mix
-	    while (i_start < i_stop || k_start < k_stop) {
-	      if (row_m == row_s) {                    // Case A: element in matrix and stack
-	        i_start++;
-	        k_start++;
-	        row_m = (i_start < i_stop) ? m_rowinx[i_start]       : m_rows+1;
-	        row_s = (k_start < k_stop) ? m_stack_rowinx[k_start] : m_rows+1;
-		  }
-		  else if (row_m < row_s) {                // Case B: element in matrix only
-	        i_start++;
-	        row_m = (i_start < i_stop) ? m_rowinx[i_start] : m_rows+1;
-		  }
-		  else {                                   // Case C: element in stack only
-	        k_start++;
-	        row_s = (k_start < k_stop) ? m_stack_rowinx[k_start] : m_rows+1;
-		    new_elements++;
-		  }
-        } // endwhile: mixing
-	  } // endif: there were elements in stack
+	  
+	  // Flag that this is a mixed column
+	  wrk_int[col] = -(entry+2);
+		
+	  // Mix while both are alive
+	  while (i_start < i_stop && k_start < k_stop) {
+		if (row_m == row_s) {                    // Case A: element in matrix and stack
+		  row_m = m_rowinx[++i_start];             // Get next matrix row number
+		  row_s = m_stack_rowinx[++k_start];       // Get next stack row number
+		}
+		else if (row_m < row_s) {                // Case B: element in matrix only
+		  row_m = m_rowinx[++i_start];             // Get next matrix row number
+		}
+		else {                                   // Case C: element in stack only
+		  row_s = m_stack_rowinx[++k_start];       // Get next stack row number
+		  new_elements++;                          // Count the new element
+		}
+	  } // endwhile: mixing while both are alive
+		
+	  // Add remaining stack elements if still alive
+	  if (k_start < k_stop)
+		new_elements += (k_stop - k_start);
+		
 	} // endif: column existed in the matrix
  
-	// Column did not exists in the matrix, so it's newand we add all elements 
+	// Column did not exists in the matrix, so it's new and we add all elements 
 	else {
 	  wrk_int[col]  = (entry+2);
 	  new_elements += (m_stack_start[entry+1] - m_stack_start[entry]);
@@ -1458,35 +1850,49 @@ void GSparseMatrix::stack_flush(void)
 	  int k_stop   = m_stack_start[entry+1];
 	  int row_m    = m_rowinx[i_start];
 	  int row_s    = m_stack_rowinx[k_start];
-	  if (k_start < k_stop && i_start < i_stop) {
-	    while (i_start < i_stop || k_start < k_stop) {
-	      if (row_m == row_s) {                    // Case A: element in matrix and stack
-		    new_data[index]    = m_data[i_start] + m_stack_data[k_start];
-		    new_rowinx[index]  = row_m;
-		    i_start++;
-		    k_start++;
-		    row_m = (i_start < i_stop) ? m_rowinx[i_start]       : m_rows+1;
-		    row_s = (k_start < k_stop) ? m_stack_rowinx[k_start] : m_rows+1;
-		  }
-		  else if (row_m < row_s) {                // Case B: element in matrix only
-		    new_data[index]   = m_data[i_start];
-		    new_rowinx[index] = row_m;
-		    i_start++;
-		    row_m = (i_start < i_stop) ? m_rowinx[i_start] : m_rows+1;
-		  }
-		  else {                                   // Case C: element in stack only
-		    new_data[index]   = m_stack_data[k_start];
-		    new_rowinx[index] = row_s;
-		    k_start++;
-		    row_s = (k_start < k_stop) ? m_stack_rowinx[k_start] : m_rows+1;
-		  } 
-		  index++;
-          #if defined(G_DEBUG_SPARSE_STACK_FLUSH)
-		  num_mix++;
-		  #endif
-        } // endwhile: mixing
-	  } // endif: there were elements in stack
-	  
+
+	  // Mix while both are alive
+	  while (i_start < i_stop && k_start < k_stop) {
+		if (row_m == row_s) {                    // Case A: element in matrix and stack
+		  new_data[index]   = m_data[i_start] + m_stack_data[k_start];
+		  new_rowinx[index] = row_m;
+		  row_m             = m_rowinx[++i_start];
+		  row_s             = m_stack_rowinx[++k_start];
+		}
+		else if (row_m < row_s) {                // Case B: element in matrix only
+		  new_data[index]   = m_data[i_start];
+		  new_rowinx[index] = row_m;
+		  row_m             = m_rowinx[++i_start];
+		}
+		else {                                   // Case C: element in stack only
+		  new_data[index]   = m_stack_data[k_start];
+		  new_rowinx[index] = row_s;
+		  row_s             = m_stack_rowinx[++k_start];
+		} 
+		index++;
+		#if defined(G_DEBUG_SPARSE_STACK_FLUSH)
+		num_mix++;
+		#endif
+	  } // endwhile: mixing
+
+	  // Add remaining matrix elements if still alive
+	  for (int i = i_start; i < i_stop; ++i) {
+		new_data[index]     = m_data[i];
+		new_rowinx[index++] = m_rowinx[i];
+		#if defined(G_DEBUG_SPARSE_STACK_FLUSH)
+		num_mix++;
+		#endif
+	  }
+
+	  // Add remaining stack elements if still alive
+	  for (int k = k_start; k < k_stop; ++k) {
+		new_data[index]     = m_stack_data[k];
+		new_rowinx[index++] = m_stack_rowinx[k];
+		#if defined(G_DEBUG_SPARSE_STACK_FLUSH)
+		num_mix++;
+		#endif
+	  }
+
 	} // endelse: we had to mix the entries
  
 	// Store actual index in column start array
@@ -1496,7 +1902,7 @@ void GSparseMatrix::stack_flush(void)
  
   // Dump number of elements in new matrix after addition
   #if defined(G_DEBUG_SPARSE_STACK_FLUSH)
-  cout << " Added elements ..: " << index << " (sould be " << elements << ")" << endl;
+  cout << " Added elements ..: " << index << " (should be " << elements << ")" << endl;
   cout << " - Matrix only ...: " << num_orig << endl;
   cout << " - Stack only ....: " << num_stack << endl;
   cout << " - Matrix & Stack : " << num_mix << endl;
@@ -98,7 +98,9 @@ public:
   virtual GVector extract_row(int row) const;
   virtual GVector extract_col(int col) const;
   virtual void    insert_col(const GVector& v, int col);
+  virtual void    insert_col(const double* values, const int* rows, int number, int col);
   virtual void    add_col(const GVector& v, int col);
+  virtual void    add_col(const double* values, const int* rows, int number, int col);
   virtual void    set_mem_block(int block);
   virtual GMatrix convert_to_full() const;
   //TBD virtual GMatrix extract_lower_triangle() const;
@@ -110,6 +112,7 @@ public:
   // Stack functions
   virtual void stack_init(int size = 0, int entries = 0);
   virtual int  stack_push_column(const GVector& v, int col);
+  virtual int  stack_push_column(const double* values, const int* rows, int number, int col);
   virtual void stack_flush(void);
   virtual void stack_destroy(void);
  
 ## Process this file with automake to produce Makefile.in
  
-SUBDIRS = src test
+files = GammaLib.hpp \
+        GException.hpp GException.cpp \
+        GVector.hpp GVector.cpp \
+	GMatrix.hpp GMatrix.cpp \
+	GSymMatrix.hpp GSymMatrix.cpp \
+	GSparseMatrix.hpp GSparseMatrix.cpp \
+	GSparseSymbolic.hpp GSparseSymbolic.cpp \
+	GSparseNumeric.hpp GSparseNumeric.cpp
  
+# Define package included headers (to be installed)
+pkginclude_HEADERS = GammaLib.hpp \
+                     GException.hpp \
+		     GVector.hpp \
+		     GMatrix.hpp \
+		     GSymMatrix.hpp \
+		     GSparseMatrix.hpp \
+		     GSparseSymbolic.hpp \
+		     GSparseNumeric.hpp
+
+# Build dynamic library
+lib_LTLIBRARIES = libgamma.la
+libgamma_la_SOURCES = $(files)
+libgamma_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
@@ -14,7 +14,8 @@
  
 @SET_MAKE@
  
-SOURCES = $(libgamma_a_SOURCES)
+
+SOURCES = $(libgamma_la_SOURCES)
  
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -39,7 +40,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -47,15 +49,20 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-libgamma_a_AR = $(AR) $(ARFLAGS)
-libgamma_a_LIBADD =
-am__objects_1 = GException.$(OBJEXT) GVector.$(OBJEXT) \
-	GMatrix.$(OBJEXT) GSymMatrix.$(OBJEXT) GSparseMatrix.$(OBJEXT) \
-	GSparseSymbolic.$(OBJEXT) GSparseNumeric.$(OBJEXT)
-am_libgamma_a_OBJECTS = $(am__objects_1)
-libgamma_a_OBJECTS = $(am_libgamma_a_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libgamma_la_LIBADD =
+am__objects_1 = GException.lo GVector.lo GMatrix.lo GSymMatrix.lo \
+	GSparseMatrix.lo GSparseSymbolic.lo GSparseNumeric.lo
+am_libgamma_la_OBJECTS = $(am__objects_1)
+libgamma_la_OBJECTS = $(am_libgamma_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -75,8 +82,10 @@ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgamma_a_SOURCES)
-DIST_SOURCES = $(libgamma_a_SOURCES)
+SOURCES = $(libgamma_la_SOURCES)
+DIST_SOURCES = $(libgamma_la_SOURCES)
+pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(pkginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -104,6 +113,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -112,12 +122,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -169,7 +175,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-files = GException.hpp GException.cpp \
+files = GammaLib.hpp \
+        GException.hpp GException.cpp \
         GVector.hpp GVector.cpp \
 	GMatrix.hpp GMatrix.cpp \
 	GSymMatrix.hpp GSymMatrix.cpp \
@@ -178,19 +185,26 @@ files = GException.hpp GException.cpp \
 	GSparseNumeric.hpp GSparseNumeric.cpp
  
  
-# Build dynamic library
-#lib_LTLIBRARIES = libgamma.la
-#libgamma_la_SOURCES = $(files)
-#libgamma_la_LDFLAGS =
+# Define package included headers (to be installed)
+pkginclude_HEADERS = GammaLib.hpp \
+                     GException.hpp \
+		     GVector.hpp \
+		     GMatrix.hpp \
+		     GSymMatrix.hpp \
+		     GSparseMatrix.hpp \
+		     GSparseSymbolic.hpp \
+		     GSparseNumeric.hpp
+
  
-# Build static library
-noinst_LIBRARIES = libgamma.a
-libgamma_a_SOURCES = $(files)
+# Build dynamic library
+lib_LTLIBRARIES = libgamma.la
+libgamma_la_SOURCES = $(files)
+libgamma_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION)
 all: all-am
  
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -215,17 +229,39 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	done
  
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libgamma.a: $(libgamma_a_OBJECTS) $(libgamma_a_DEPENDENCIES) 
-	-rm -f libgamma.a
-	$(libgamma_a_AR) libgamma.a $(libgamma_a_OBJECTS) $(libgamma_a_LIBADD)
-	$(RANLIB) libgamma.a
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libgamma.la: $(libgamma_la_OBJECTS) $(libgamma_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libgamma_la_LDFLAGS) $(libgamma_la_OBJECTS) $(libgamma_la_LIBADD) $(LIBS)
  
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -251,6 +287,23 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
+	done
  
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -329,8 +382,11 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -357,7 +413,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
  
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
  
 distclean: distclean-am
@@ -375,9 +431,9 @@ info: info-am
  
 info-am:
  
-install-data-am:
+install-data-am: install-pkgincludeHEADERS
  
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
  
 install-info: install-info-am
  
@@ -402,21 +458,23 @@ ps: ps-am
  
 ps-am:
  
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-pkgincludeHEADERS
  
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-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-exec-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pkgincludeHEADERS \
 	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
+	uninstall-info-am uninstall-libLTLIBRARIES \
+	uninstall-pkgincludeHEADERS
  
-#libgamma_a_LDFLAGS =
 # 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:
 ## Process this file with automake to produce Makefile.in
  
-SUBDIRS = src test
-
+check_PROGRAMS = test_GVector \
+                 test_GMatrix \
+                 test_GSymMatrix \
+		 test_GSparseMatrix
+TESTS = test_GVector \
+        test_GMatrix \
+        test_GSymMatrix \
+	test_GSparseMatrix
+test_GVector_SOURCES = test_GVector.cpp
+test_GVector_LDADD = ../src/libgamma.a
+test_GMatrix_SOURCES = test_GMatrix.cpp
+test_GMatrix_LDADD = ../src/libgamma.a
+test_GSymMatrix_SOURCES = test_GSymMatrix.cpp
+test_GSymMatrix_LDADD = ../src/libgamma.a
+test_GSparseMatrix_SOURCES = test_GSparseMatrix.cpp
+test_GSparseMatrix_LDADD = ../src/libgamma.a
@@ -102,6 +102,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -110,12 +111,8 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -173,22 +170,18 @@ TESTS = test_GVector \
 	test_GSparseMatrix
  
 test_GVector_SOURCES = test_GVector.cpp
-#test_GVector_LDADD = ../src/libgamma.la
 test_GVector_LDADD = ../src/libgamma.a
 test_GMatrix_SOURCES = test_GMatrix.cpp
-#test_GMatrix_LDADD = ../src/libgamma.la
 test_GMatrix_LDADD = ../src/libgamma.a
 test_GSymMatrix_SOURCES = test_GSymMatrix.cpp
-#test_GSymMatrix_LDADD = ../src/libgamma.la
 test_GSymMatrix_LDADD = ../src/libgamma.a
 test_GSparseMatrix_SOURCES = test_GSparseMatrix.cpp
-#test_GSparseMatrix_LDADD = ../src/libgamma.la
-test_GSparseMatrix_LDADD = ../src/libgamma.a -lc_p
+test_GSparseMatrix_LDADD = ../src/libgamma.a
 all: all-am
  
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -213,9 +206,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
 clean-checkPROGRAMS:
@@ -15,8 +15,7 @@
 #define TEST_GMATRIX_HPP
  
 /* __ Includes ___________________________________________________________ */
-#include "../src/GVector.hpp"
-#include "../src/GMatrix.hpp"
+#include "../src/GammaLib.hpp"
 #include <iostream>                           // cout, cerr
 #include <stdexcept>                          // std::exception
 #include <math.h>
@@ -22,13 +22,13 @@ using namespace std;
 #define DUMP_TIMING                                          // Dump timing
  
 /* __ Globals ____________________________________________________________ */
-double   g_matrix[] = {1.0, 7.0, 3.0, 2.0, 4.0, 8.0, 5.0, 6.0, 9.0};
-int g_row[]    = {  0,   0,   1,   2,   2,   2,   3,   3,   3};
-int g_col[]    = {  0,   4,   1,   0,   2,   4,   2,   3,   4};
-double   g_vector[] = {1.0, 2.0, 3.0, 4.0, 5.0};
-int g_elements = 9;
-int g_rows     = 4;
-int g_cols     = 5;
+double g_matrix[] = {1.0, 7.0, 3.0, 2.0, 4.0, 8.0, 5.0, 6.0, 9.0};
+int    g_row[]    = {  0,   0,   1,   2,   2,   2,   3,   3,   3};
+int    g_col[]    = {  0,   4,   1,   0,   2,   4,   2,   3,   4};
+double g_vector[] = {1.0, 2.0, 3.0, 4.0, 5.0};
+int    g_elements = 9;
+int    g_rows     = 4;
+int    g_cols     = 5;
  
  
 /***************************************************************************
@@ -761,6 +761,34 @@ void test_arithmetics(const GSparseMatrix&amp; m_test)
 	  throw;
 	}
 	cout << ".";
+	//
+	// GSparseMatrix.add_col() using a compressed array
+	GSparseMatrix compare = m_test;
+ 	GVector v_sparse(g_rows);
+	for (int i = 0; i < g_rows; i += 2)  // Build vector for comparison
+	  v_sparse(i) = 7.0;
+	for (int col = 0; col < g_cols; ++col)
+	  compare.add_col(v_sparse, col);
+	result = m_test;
+	double* values = new double[g_rows];
+	int*    rows   = new int[g_rows];
+	int     number = 0;
+	for (int i = 0; i < g_rows; i += 2, ++number) {
+	  values[number] = 7.0;
+	  rows[number]   = i;
+	}
+	for (int col = 0; col < g_cols; ++col)
+	  result.add_col(values, rows, number, col);
+    delete [] values;
+	delete [] rows;
+    if (result != compare) {
+      cout << endl << "TEST ERROR: Corrupt GSparseMatrix.add_col(compressed array)." << endl;
+	  cout << "m_test " << m_test << endl;
+	  cout << "result " << result << endl;
+	  cout << "compare " << compare << endl;
+	  throw;
+	}
+	cout << ".";
   }
   catch (exception &e) {
     cout << e.what() << endl;
@@ -1402,11 +1430,12 @@ void test_heavy(int block = 512)
     //
 	// Insert columns into 10000 x 10000 matrix
 	number   = 10000;
-	num_cols = 1000;
-	large.clear();
+	num_cols = 10000;
+	GSparseMatrix diag(number,number);
+	for (int j = 10; j < number-10; ++j)
+	  diag(j,j) = 3.14;
+	large = diag;
 	large.set_mem_block(block);
-	for (int j = 200; j < 400; ++j)
-	  large(j,j) = 3.14;
 	GVector column(number);
     t_start = clock();
 	for (int j = 0; j < num_cols; ++j) {
@@ -1420,18 +1449,18 @@ void test_heavy(int block = 512)
 	t_elapse = double(clock() - t_start)/double(CLOCKS_PER_SEC);
     #if defined(DUMP_TIMING)
 	cout << endl << " - " << num_cols << " columns adding needed " << t_elapse << 
-	                " sec (reference ~ 0.4 sec)";
+	                " sec (reference ~ 4.8 sec)";
 	#endif   
     //
 	// Insert columns into 10000 x 10000 matrix using matrix stack
 	GSparseMatrix stack(number,number);
-	stack.clear();
+	stack = diag;
 	stack.set_mem_block(block);
 	for (int j = 200; j < 400; ++j)
 	  stack(j,j) = 3.14;
     t_start = clock();
 	column = GVector(number);
-	stack.stack_init(20000,100);
+	stack.stack_init(10000,10000);
 	for (int j = 0; j < num_cols; ++j) {
 	  i_min = (j < 2)          ? 0 : j-2;
 	  i_max = (j > num_cols-2) ? num_cols : j+2;
@@ -1444,7 +1473,7 @@ void test_heavy(int block = 512)
 	t_elapse = double(clock() - t_start)/double(CLOCKS_PER_SEC);
     #if defined(DUMP_TIMING)
 	cout << endl << " - " << num_cols << " columns stack-adding needed " << t_elapse << 
-	                " sec (reference ~ 0.1 sec)";
+	                " sec (reference ~ 1.3 sec)";
 	#endif
 	//
 	// Check that both are identical
@@ -15,7 +15,7 @@
 #define TEST_GSPARSEMATRIX_HPP
  
 /* __ Includes ___________________________________________________________ */
-#include "../src/GSparseMatrix.hpp"
+#include "../src/GammaLib.hpp"
 #include <iostream>                           // cout, cerr
 #include <stdexcept>                          // std::exception
 #include <math.h>
@@ -15,7 +15,7 @@
 #define TEST_GSYMMATRIX_HPP
  
 /* __ Includes ___________________________________________________________ */
-#include "../src/GSymMatrix.hpp"
+#include "../src/GammaLib.hpp"
 #include <iostream>                           // cout, cerr
 #include <stdexcept>                          // std::exception
 #include <math.h>
@@ -15,8 +15,7 @@
 #define TEST_VECTOR_HPP
  
 /* __ Includes ___________________________________________________________ */
-//#include "../src/gammalib.hpp"
-#include "../src/GVector.hpp"
+#include "../src/GammaLib.hpp"
 #include <iostream>                           // cout, cerr
 #include <stdexcept>                          // std::exception
 #include <math.h>