From cecb7bb4138511e894351d1a180cca9a9b920a67 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 17 Jan 2012 18:33:06 +0000
Subject: [PATCH] add missing Makefile.ams, fix installation directories
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7398 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
configure.ac | 6 +++++-
dumux/boxmodels/MpNc/Makefile.am | 2 ++
dumux/boxmodels/MpNc/diffusion/Makefile.am | 4 ++++
dumux/boxmodels/MpNc/energy/Makefile.am | 4 ++++
dumux/boxmodels/MpNc/mass/Makefile.am | 4 ++++
dumux/boxmodels/common/Makefile.am | 2 +-
dumux/decoupled/common/Makefile.am | 2 ++
dumux/decoupled/common/fv/Makefile.am | 4 ++++
dumux/material/components/iapws/Makefile.am | 2 +-
dumux/material/constraintsolvers/Makefile.am | 3 +++
dumux/material/eos/Makefile.am | 3 +++
dumux/material/fluidmatrixinteractions/Mp/Makefile.am | 3 +++
dumux/material/fluidstates/Makefile.am | 3 +++
dumux/material/fluidsystems/Makefile.am | 3 +++
dumux/material/old_fluidsystems/Makefile.am | 4 ++--
15 files changed, 44 insertions(+), 5 deletions(-)
create mode 100644 dumux/boxmodels/MpNc/diffusion/Makefile.am
create mode 100644 dumux/boxmodels/MpNc/energy/Makefile.am
create mode 100644 dumux/boxmodels/MpNc/mass/Makefile.am
create mode 100644 dumux/decoupled/common/fv/Makefile.am
diff --git a/configure.ac b/configure.ac
index c37aa42ad8..84986fa0c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,9 @@ AC_CONFIG_FILES([dumux.pc
dumux/boxmodels/2pni/Makefile
dumux/boxmodels/common/Makefile
dumux/boxmodels/MpNc/Makefile
+ dumux/boxmodels/MpNc/diffusion/Makefile
+ dumux/boxmodels/MpNc/energy/Makefile
+ dumux/boxmodels/MpNc/mass/Makefile
dumux/boxmodels/richards/Makefile
dumux/common/Makefile
dumux/decoupled/Makefile
@@ -38,7 +41,8 @@ AC_CONFIG_FILES([dumux.pc
dumux/decoupled/2p/transport/Makefile
dumux/decoupled/2p/transport/fv/Makefile
dumux/decoupled/2p2c/Makefile
- dumux/decoupled/common/Makefile
+ dumux/decoupled/common/Makefile
+ dumux/decoupled/common/fv/Makefile
dumux/io/Makefile
dumux/linear/Makefile
dumux/material/Makefile
diff --git a/dumux/boxmodels/MpNc/Makefile.am b/dumux/boxmodels/MpNc/Makefile.am
index 0df2b8036b..8081f4cc72 100644
--- a/dumux/boxmodels/MpNc/Makefile.am
+++ b/dumux/boxmodels/MpNc/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = diffusion energy mass
+
MpNcdir = $(includedir)/dumux/boxmodels/MpNc
MpNc_HEADERS = *.hh
diff --git a/dumux/boxmodels/MpNc/diffusion/Makefile.am b/dumux/boxmodels/MpNc/diffusion/Makefile.am
new file mode 100644
index 0000000000..b83ffaae5f
--- /dev/null
+++ b/dumux/boxmodels/MpNc/diffusion/Makefile.am
@@ -0,0 +1,4 @@
+diffusiondir = $(includedir)/dumux/boxmodels/MpNc/diffusion
+diffusion_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/MpNc/energy/Makefile.am b/dumux/boxmodels/MpNc/energy/Makefile.am
new file mode 100644
index 0000000000..72e0ab5b15
--- /dev/null
+++ b/dumux/boxmodels/MpNc/energy/Makefile.am
@@ -0,0 +1,4 @@
+energydir = $(includedir)/dumux/boxmodels/MpNc/energy
+energy_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/MpNc/mass/Makefile.am b/dumux/boxmodels/MpNc/mass/Makefile.am
new file mode 100644
index 0000000000..36ca38efb9
--- /dev/null
+++ b/dumux/boxmodels/MpNc/mass/Makefile.am
@@ -0,0 +1,4 @@
+massdir = $(includedir)/dumux/boxmodels/MpNc/mass
+mass_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/common/Makefile.am b/dumux/boxmodels/common/Makefile.am
index 2bec4f1c98..2fd0a582d6 100644
--- a/dumux/boxmodels/common/Makefile.am
+++ b/dumux/boxmodels/common/Makefile.am
@@ -1,4 +1,4 @@
-commondir = $(includedir)/dumux/boxmodels/2p
+commondir = $(includedir)/dumux/boxmodels/common
common_HEADERS = *.hh
include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/common/Makefile.am b/dumux/decoupled/common/Makefile.am
index d9f45519fd..7a7b9ad9f5 100644
--- a/dumux/decoupled/common/Makefile.am
+++ b/dumux/decoupled/common/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = fv
+
commondir = $(includedir)/dumux/decoupled/common
common_HEADERS = *.hh
diff --git a/dumux/decoupled/common/fv/Makefile.am b/dumux/decoupled/common/fv/Makefile.am
new file mode 100644
index 0000000000..70d3683b95
--- /dev/null
+++ b/dumux/decoupled/common/fv/Makefile.am
@@ -0,0 +1,4 @@
+fvdir = $(includedir)/dumux/decoupled/common/fv
+fv_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/components/iapws/Makefile.am b/dumux/material/components/iapws/Makefile.am
index 3b67e0690e..f3ea40c469 100644
--- a/dumux/material/components/iapws/Makefile.am
+++ b/dumux/material/components/iapws/Makefile.am
@@ -1,4 +1,4 @@
-iapwsdir = $(includedir)/dumux/material/iapws
+iapwsdir = $(includedir)/dumux/material/components/iapws
iapws_HEADERS = *.hh
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/constraintsolvers/Makefile.am b/dumux/material/constraintsolvers/Makefile.am
index 70f8f17461..fbcaa287aa 100644
--- a/dumux/material/constraintsolvers/Makefile.am
+++ b/dumux/material/constraintsolvers/Makefile.am
@@ -1 +1,4 @@
+constraintsolversdir = $(includedir)/dumux/material/constraintsolvers
+constraintsolvers_HEADERS = *.hh
+
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/eos/Makefile.am b/dumux/material/eos/Makefile.am
index 70f8f17461..4b728c1730 100644
--- a/dumux/material/eos/Makefile.am
+++ b/dumux/material/eos/Makefile.am
@@ -1 +1,4 @@
+eosdir = $(includedir)/dumux/material/eos
+eos_HEADERS = *.hh
+
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidmatrixinteractions/Mp/Makefile.am b/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
index 70f8f17461..bb1d1376be 100644
--- a/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
+++ b/dumux/material/fluidmatrixinteractions/Mp/Makefile.am
@@ -1 +1,4 @@
+mpdir = $(includedir)/dumux/material/fluidmatrixinteractions/Mp
+mp_HEADERS = *.hh
+
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidstates/Makefile.am b/dumux/material/fluidstates/Makefile.am
index 70f8f17461..46d4e003b7 100644
--- a/dumux/material/fluidstates/Makefile.am
+++ b/dumux/material/fluidstates/Makefile.am
@@ -1 +1,4 @@
+fluidstatesdir = $(includedir)/dumux/material/fluidstates
+fluidstates_HEADERS = *.hh
+
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/fluidsystems/Makefile.am b/dumux/material/fluidsystems/Makefile.am
index 70f8f17461..fc6f9a87b5 100644
--- a/dumux/material/fluidsystems/Makefile.am
+++ b/dumux/material/fluidsystems/Makefile.am
@@ -1 +1,4 @@
+fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
+fluidsystems_HEADERS = *.hh
+
include $(top_srcdir)/am/global-rules
diff --git a/dumux/material/old_fluidsystems/Makefile.am b/dumux/material/old_fluidsystems/Makefile.am
index fc6f9a87b5..7001e9d908 100644
--- a/dumux/material/old_fluidsystems/Makefile.am
+++ b/dumux/material/old_fluidsystems/Makefile.am
@@ -1,4 +1,4 @@
-fluidsystemsdir = $(includedir)/dumux/material/fluidsystems
-fluidsystems_HEADERS = *.hh
+oldfluidsystemsdir = $(includedir)/dumux/material/old_fluidsystems
+oldfluidsystems_HEADERS = *.hh
include $(top_srcdir)/am/global-rules
--
GitLab