Changeset 540c4ef

Timestamp:

Feb 15, 2017, 4:18:50 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

3bf29e

Parents:

2d63fb

git-author:

Frederik Heber <heber@…> (02/15/17 16:17:55)

git-committer:

Frederik Heber <heber@…> (02/15/17 16:18:50)

Message:

tempcommit: Fix into standalone package.

Files:

• INSTALL (added)
• NEWS (added)
• README (added)
• configure.ac (modified) (4 diffs)
• m4 (deleted)
• m4/acx_mpi.m4 (added)
• m4/am_path_vtk.m4 (added)
• m4/ax_fcs_package.m4 (added)
• m4/ax_fcs_types.m4 (added)
• m4/ax_prog_cc_mpi.m4 (added)
• m4/ax_prog_fc_mpi.m4 (added)
• m4/boost.m4 (added)
• m4/libtool.m4 (added)
• m4/ltoptions.m4 (added)
• m4/ltsugar.m4 (added)
• m4/ltversion.m4 (added)
• m4/lt~obsolete.m4 (added)
• src/Makefile.am (modified) (2 diffs)
• vmg.pc.in (added)

configure.ac

@@ -13 +13 @@
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.7 -Wall foreign subdir-objects])
+AC_CONFIG_HEADERS([libvmg_config.h])
+AM_INIT_AUTOMAKE([1.7 dist-bzip2 1.5 parallel-tests color-tests tar-pax subdir-objects])
 
 # We use mostly C++, but may need Fortran compiler infos for Lapack.
@@ -20 +20 @@
 
 # Release version switch
-AC_MSG_CHECKING(whether to enable release version)
-AC_ARG_ENABLE([release], 
-        AS_HELP_STRING([--enable-release], [Compile with release settings]),
-        enable_release=$enableval,
-        enable_release="no")
-AC_MSG_RESULT($enable_release)
-AS_IF([test "$enable_release" = "yes"], [
+AC_MSG_CHECKING(whether to enable debug version)
+AC_ARG_ENABLE([debug], 
+        AS_HELP_STRING([--enable-debug], [Compile with debug settings]),
+        enable_debug=$enableval,
+        enable_debug="no")
+AC_MSG_RESULT($enable_debug)
+AS_IF([test "$enable_debug" = "no"], [
             AC_DEFINE([RELEASE], [1], [Release])
             AC_DEFINE([NDEBUG], [1], [Skip asserts])
@@ -183 +183 @@
 AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST_LIB], [test x"$boost_cv_lib_unit_test_framework" = xyes])
 
-AC_PROG_RANLIB
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+# use libtool
+LT_INIT([static])
+
+# superceded by libtool
+#AC_PROG_RANLIB
+#4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
+# Define these substitions here to keep all version information in one place.
+# For information on how to properly maintain the library version information,
+# refer to the libtool manual, section "Updating library version information":
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([VMG_SO_VERSION], [1:0:0])
+AC_SUBST([VMG_API_VERSION], [1.0.0])
 
 # Checks for libraries.
@@ -239 +250 @@
         doc/Makefile
         test/Makefile])
+AC_CONFIG_FILES([vmg.pc:vmg.pc.in])
+
 AC_OUTPUT

src/Makefile.am

@@ -1 @@
-if ENABLE_LIBRARY_INSTALL
-lib_LIBRARIES = libfcs_vmg.a
-else
-noinst_LIBRARIES = libfcs_vmg.a
-endif
-
-libfcs_vmg_a_SOURCES =  \
+
+VMGSOURCES =  \
         base/command_factory.cpp \
-        base/command_factory.hpp \
         base/command_list.cpp \
-        base/command_list.hpp \
-        base/command.hpp \
-        base/defs.hpp \
-        base/discretization.hpp \
         base/factory.cpp \
-        base/factory.hpp \
-        base/has_tempgrids.hpp \
         base/helper.cpp \
-        base/helper.hpp \
         base/index.cpp \
-        base/index.hpp \
         base/interface.cpp \
-        base/interface.hpp \
-        base/math.hpp \
         base/matrix.cpp \
-        base/matrix.hpp \
         base/object.cpp \
-        base/object.hpp \
-        base/polynomial.hpp \
         base/proxy.cpp \
-        base/proxy.hpp \
         base/stencil.cpp \
-        base/stencil.hpp \
         base/timer.cpp \
-        base/timer.hpp \
-        base/tuple.hpp \
         base/vector.cpp \
-        base/vector.hpp \
         comm/comm_mpi.cpp \
-        comm/comm_mpi.hpp \
         comm/comm_serial.cpp \
-        comm/comm_serial.hpp \
         comm/comm.cpp \
-        comm/comm.hpp \
-        comm/domain_decomposition.hpp \
         comm/domain_decomposition_mpi.cpp \
-        comm/domain_decomposition_mpi.hpp \
         comm/domain_decomposition_serial.cpp \
-        comm/domain_decomposition_serial.hpp \
         comm/mpi/datatype.cpp \
-        comm/mpi/datatype.hpp \
         comm/mpi/datatypes_global.cpp \
-        comm/mpi/datatypes_global.hpp \
         comm/mpi/datatypes_local.cpp \
-        comm/mpi/datatypes_local.hpp \
         comm/mpi/settings.cpp \
-        comm/mpi/settings.hpp \
         comm/mpi/error_handler.cpp \
-        comm/mpi/error_handler.hpp \
-        comm/mpi/has_request_vec.hpp \
-        comm/mpi/key.hpp \
         commands/com_check_consistency.cpp \
         commands/com_check_iteration_counter.cpp \
@@ -93 +56 @@
         commands/com_solve.cpp \
         cycles/cycle.cpp \
+        cycles/cycle_cs_dirichlet.cpp \
+        cycles/cycle_cs_dirichlet_debug.cpp \
+        cycles/cycle_cs_periodic.cpp \
+        cycles/cycle_cs_periodic_debug.cpp \
+        cycles/cycle_fas_dirichlet.cpp \
+        cycles/cycle_fas_dirichlet_debug.cpp \
+        cycles/cycle_fas_periodic.cpp \
+        cycles/cycle_fas_periodic_debug.cpp \
+        discretization/boundary_value_setter.cpp \
+        discretization/discretization_poisson_fd.cpp \
+        discretization/discretization_poisson_fv.cpp \
+        grid/global_grid_partitioning.cpp \
+        grid/grid_index_translations.cpp \
+        grid/grid_iterator_suite.cpp \
+        grid/grid.cpp \
+        grid/multigrid.cpp \
+        grid/tempgrid.cpp \
+        level/level_operator_cs.cpp \
+        level/level_operator_fas.cpp \
+        smoother/gs.cpp \
+        smoother/gsrb.cpp \
+        smoother/gsrb_poisson_2.cpp \
+        smoother/gsrb_poisson_4.cpp \
+        smoother/jacobi.cpp \
+        smoother/smoother.cpp \
+        solver/solver_regular.cpp \
+        solver/solver_singular.cpp \
+        solver/solver.cpp \
+        thirdparty/pugixml/pugixml.cpp \
+        units/particle/bspline.cpp \
+        units/particle/comm_mpi_particle.cpp \
+        units/particle/interface_fcs.cpp \
+        units/particle/interface_fcs.h \
+        units/particle/interface_particles.cpp \
+        units/particle/interpolation.cpp \
+        units/particle/linked_cell_list.cpp \
+        units/particle/particle.cpp \
+        mg.cpp
+
+VMGHEADERS =  \
+        base/command_factory.hpp \
+        base/command_list.hpp \
+        base/command.hpp \
+        base/defs.hpp \
+        base/discretization.hpp \
+        base/factory.hpp \
+        base/has_tempgrids.hpp \
+        base/helper.hpp \
+        base/index.hpp \
+        base/interface.hpp \
+        base/math.hpp \
+        base/matrix.hpp \
+        base/object.hpp \
+        base/polynomial.hpp \
+        base/proxy.hpp \
+        base/stencil.hpp \
+        base/timer.hpp \
+        base/tuple.hpp \
+        base/vector.hpp \
+        comm/comm_mpi.hpp \
+        comm/comm_serial.hpp \
+        comm/comm.hpp \
+        comm/domain_decomposition.hpp \
+        comm/domain_decomposition_mpi.hpp \
+        comm/domain_decomposition_serial.hpp \
+        comm/mpi/datatype.hpp \
+        comm/mpi/datatypes_global.hpp \
+        comm/mpi/datatypes_local.hpp \
+        comm/mpi/settings.hpp \
+        comm/mpi/error_handler.hpp \
+        comm/mpi/has_request_vec.hpp \
+        comm/mpi/key.hpp \
         cycles/cycle.hpp \
-        cycles/cycle_cs_dirichlet.cpp \
         cycles/cycle_cs_dirichlet.hpp \
-        cycles/cycle_cs_dirichlet_debug.cpp \
         cycles/cycle_cs_dirichlet_debug.hpp \
-        cycles/cycle_cs_periodic.cpp \
         cycles/cycle_cs_periodic.hpp \
-        cycles/cycle_cs_periodic_debug.cpp \
         cycles/cycle_cs_periodic_debug.hpp \
-        cycles/cycle_fas_dirichlet.cpp \
         cycles/cycle_fas_dirichlet.hpp \
-        cycles/cycle_fas_dirichlet_debug.cpp \
         cycles/cycle_fas_dirichlet_debug.hpp \
-        cycles/cycle_fas_periodic.cpp \
         cycles/cycle_fas_periodic.hpp \
-        cycles/cycle_fas_periodic_debug.cpp \
         cycles/cycle_fas_periodic_debug.hpp \
         discretization/boundary_value.hpp \
-        discretization/boundary_value_setter.cpp \
         discretization/boundary_value_setter.hpp \
         discretization/boundary_value_setter_open.hpp \
-        discretization/discretization_poisson_fd.cpp \
         discretization/discretization_poisson_fd.hpp \
-        discretization/discretization_poisson_fv.cpp \
         discretization/discretization_poisson_fv.hpp \
-        grid/global_grid_partitioning.cpp \
         grid/global_grid_partitioning.hpp \
         grid/grid_double_iterator.hpp \
-        grid/grid_index_translations.cpp \
         grid/grid_index_translations.hpp \
         grid/grid_iterator.hpp \
         grid/grid_iterator_set.hpp \
-        grid/grid_iterator_suite.cpp \
         grid/grid_iterator_suite.hpp \
         grid/grid_properties.hpp \
-        grid/grid.cpp \
         grid/grid.hpp \
         grid/is_grid.hpp \
-        grid/multigrid.cpp \
         grid/multigrid.hpp \
-        grid/tempgrid.cpp \
         grid/tempgrid.hpp \
-        level/level_operator_cs.cpp \
         level/level_operator_cs.hpp \
-        level/level_operator_fas.cpp \
         level/level_operator_fas.hpp \
         level/level_operator.hpp \
         level/stencils.hpp \
-        smoother/gs.cpp \
         smoother/gs.hpp \
-        smoother/gsrb.cpp \
         smoother/gsrb.hpp \
-        smoother/gsrb_poisson_2.cpp \
         smoother/gsrb_poisson_2.hpp \
-        smoother/gsrb_poisson_4.cpp \
         smoother/gsrb_poisson_4.hpp \
-        smoother/jacobi.cpp \
         smoother/jacobi.hpp \
-        smoother/smoother.cpp \
         smoother/smoother.hpp \
         solver/dgesv.hpp \
         solver/dsysv.hpp \
         solver/givens.hpp \
-        solver/solver_regular.cpp \
         solver/solver_regular.hpp \
-        solver/solver_singular.cpp \
         solver/solver_singular.hpp \
-        solver/solver.cpp \
         solver/solver.hpp \
         thirdparty/pugixml/pugiconfig.hpp \
-        thirdparty/pugixml/pugixml.cpp \
         thirdparty/pugixml/pugixml.hpp \
-        units/particle/bspline.cpp \
         units/particle/bspline.hpp \
-        units/particle/comm_mpi_particle.cpp \
         units/particle/comm_mpi_particle.hpp \
-        units/particle/interface_fcs.cpp \
         units/particle/interface_fcs.h \
-        units/particle/interface_particles.cpp \
         units/particle/interface_particles.hpp \
-        units/particle/interpolation.cpp \
         units/particle/interpolation.hpp \
-        units/particle/linked_cell_list.cpp \
         units/particle/linked_cell_list.hpp \
-        units/particle/particle.cpp \
         units/particle/particle.hpp \
-        mg.cpp \
         mg.hpp
 
-libfcs_vmg_a_CPPFLAGS = $(BOOST_CPPFLAGS) $(VTK_CXXFLAGS)
-
-pkgconfigdir = $(libdir)/pkg-config
-pkgconfig_DATA = $(top_builddir)/VMG.pc
-
+lib_LTLIBRARIES = libvmg.la
+
+libvmg_la_includedir = $(includedir)/vmg/
+libvmg_la_CPPFLAGS = $(BOOST_CPPFLAGS) $(VTK_CXXFLAGS)
+libvmg_la_LDFLAGS = \
+        $(AM_LDFLAGS)
+libvmg_la_LIBADD =
+
+nobase_libvmg_la_include_HEADERS = ${VMGHEADERS}
+
+## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
+## target.  Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
+## will therefore be treated as if it were literally part of the target name,
+## and the variable name derived from that.
+## The file extension .cc is recognized by Automake, and makes it produce
+## rules which invoke the C++ compiler to produce a libtool object file (.lo)
+## from each source file.  Note that it is not necessary to list header files
+## which are already listed elsewhere in a _HEADERS variable assignment.
+libvmg_la_SOURCES = ${VMGSOURCES}
+
+## Instruct libtool to include ABI version information in the generated shared
+## library file (.so).  The library ABI version is defined in configure.ac, so
+## that all version information is kept in one place.
+libvmg_la_LDFLAGS += -version-info $(VMG_SO_VERSION)
+
+## The generated configuration header is installed in its own subdirectory of
+## $(libdir).  The reason for this is that the configuration information put
+## into this header file describes the target platform the installed library
+## has been built for.  Thus the file must not be installed into a location
+## intended for architecture-independent files, as defined by the Filesystem
+## Hierarchy Standard (FHS).
+## The nodist_ prefix instructs Automake to not generate rules for including
+## the listed files in the distribution on 'make dist'.  Files that are listed
+## in _HEADERS variables are normally included in the distribution, but the
+## configuration header file is generated at configure time and should not be
+## shipped with the source tarball.
+libvmg_la_libincludedir = $(libdir)/vmg/include
+nodist_libvmg_la_libinclude_HEADERS = $(top_builddir)/libvmg_config.h
+
+## Install the generated pkg-config file (.pc) into the expected location for
+## architecture-dependent package configuration information.  Occasionally,
+## pkg-config files are also used for architecture-independent data packages,
+## in which case the correct install location would be $(datadir)/pkgconfig.
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(top_builddir)/vmg.pc