From b6d4921f86920bb3e7d43be9434870db5f7375a4 Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Tue, 26 Jun 2012 01:42:58 +0200 Subject: [PATCH] Change branding from DUNE to OPM Only the configuration files where the library name is mentioned are changed. Renaming the directory dune/ to opm/ would require massive change through-out the code. --- Makefile.am | 2 +- configure.ac | 6 +++--- dune.module | 4 ++-- m4/Makefile.am | 2 +- m4/dune-upscaling.m4 | 18 ------------------ m4/opm-upscaling.m4 | 18 ++++++++++++++++++ dune-upscaling.pc.in => opm-upscaling.pc.in | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 m4/dune-upscaling.m4 create mode 100644 m4/opm-upscaling.m4 rename dune-upscaling.pc.in => opm-upscaling.pc.in (80%) diff --git a/Makefile.am b/Makefile.am index 9d892e8..650b612 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) \ --with-dune-grid=$(DUNE_GRID_ROOT) \ --with-dune-istl=$(DUNE_ISTL_ROOT) \ --with-dune-cornerpoint=$(DUNE_CORNERPOINT_ROOT) \ - --with-dune-porsol=$(DUNE_PORSOL_ROOT) \ + --with-opm-porsol=$(OPM_PORSOL_ROOT) \ CXX="$(CXX)" CC="$(CC)" include $(top_srcdir)/am/top-rules diff --git a/configure.ac b/configure.ac index 3cd8658..227243d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,8 @@ AM_CONFIG_HEADER([config.h]) # we need no more than the standard DE-stuff -# this module depends on dune-common dune-grid dune-istl dune-cornerpoint dune-porsol -# this implies checking for [dune-common], [dune-grid], [dune-istl], [dune-cornerpoint], [dune-porsol] +# this module depends on dune-common dune-grid dune-istl dune-cornerpoint opm-porsol +# this implies checking for [dune-common], [dune-grid], [dune-istl], [dune-cornerpoint], [opm-porsol] DUNE_CHECK_ALL # implicitly set the Dune-flags everywhere @@ -36,7 +36,7 @@ AC_CONFIG_FILES([ dune/Makefile dune/upscaling/Makefile dune/upscaling/test/Makefile - dune-upscaling.pc + opm-upscaling.pc examples/Makefile ]) AC_OUTPUT diff --git a/dune.module b/dune.module index 2bf06bb..5de3e63 100644 --- a/dune.module +++ b/dune.module @@ -3,8 +3,8 @@ ################################ #Name of the module -Module: dune-upscaling +Module: opm-upscaling Version: 0.1 Maintainer: atgeirr@sintef.no #depending on -Depends: dune-common dune-grid dune-istl dune-cornerpoint dune-porsol +Depends: dune-common dune-grid dune-istl dune-cornerpoint opm-porsol diff --git a/m4/Makefile.am b/m4/Makefile.am index f4008cc..f36e7e4 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,4 +1,4 @@ -M4FILES = dune-upscaling.m4 +M4FILES = opm-upscaling.m4 aclocaldir = $(datadir)/aclocal aclocal_DATA = $(M4FILES) diff --git a/m4/dune-upscaling.m4 b/m4/dune-upscaling.m4 deleted file mode 100644 index d659f59..0000000 --- a/m4/dune-upscaling.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl -*- autoconf -*- -# Macros needed to find dune-upscaling and dependent libraries. They are called by -# the macros in ${top_src_dir}/dependencies.m4, which is generated by -# "dunecontrol autogen" - -# Additional checks needed to build dune-upscaling -# This macro should be invoked by every module which depends on dune-upscaling, as -# well as by dune-upscaling itself -AC_DEFUN([DUNE_UPSCALING_CHECKS]) - -# Additional checks needed to find dune-upscaling -# This macro should be invoked by every module which depends on dune-upscaling, but -# not by dune-upscaling itself -AC_DEFUN([DUNE_UPSCALING_CHECK_MODULE], -[ - DUNE_CHECK_MODULES([dune-upscaling], - [upscaling/SinglePhaseUpscaler.hpp]) -]) diff --git a/m4/opm-upscaling.m4 b/m4/opm-upscaling.m4 new file mode 100644 index 0000000..e5c260c --- /dev/null +++ b/m4/opm-upscaling.m4 @@ -0,0 +1,18 @@ +dnl -*- autoconf -*- +# Macros needed to find opm-upscaling and dependent libraries. They are called by +# the macros in ${top_src_dir}/dependencies.m4, which is generated by +# "dunecontrol autogen" + +# Additional checks needed to build opm-upscaling +# This macro should be invoked by every module which depends on opm-upscaling, as +# well as by opm-upscaling itself +AC_DEFUN([OPM_UPSCALING_CHECKS]) + +# Additional checks needed to find opm-upscaling +# This macro should be invoked by every module which depends on opm-upscaling, but +# not by opm-upscaling itself +AC_DEFUN([OPM_UPSCALING_CHECK_MODULE], +[ + DUNE_CHECK_MODULES([opm-upscaling], + [upscaling/SinglePhaseUpscaler.hpp]) +]) diff --git a/dune-upscaling.pc.in b/opm-upscaling.pc.in similarity index 80% rename from dune-upscaling.pc.in rename to opm-upscaling.pc.in index 77ee84d..fb4d41b 100644 --- a/dune-upscaling.pc.in +++ b/opm-upscaling.pc.in @@ -9,7 +9,7 @@ DEPENDENCIES=@REQUIRES@ Name: @PACKAGE_NAME@ Version: @VERSION@ Description: A Dune module containing single-phase and steady-state upscaling methods. -URL: http://public.ict.sintef.no/openrs +URL: http://www.opm-project.org Requires: ${DEPENDENCIES} -Libs: -L${libdir} -lduneupscaling +Libs: -L${libdir} -lopmupscaling Cflags: -I${includedir}