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

@@ -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

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

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

m4/Makefile.am

@@ -1,4 +1,4 @@
-M4FILES = dune-upscaling.m4
+M4FILES = opm-upscaling.m4
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = $(M4FILES)

m4/dune-upscaling.m4

@@ -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])
-])

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])
+])

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}