simplified family configuration

config/Compiler.d/Compiler.conf

@@ -1 +0,0 @@
-../Compiler.conf

config/Compiler.d/compiler.conf

@@ -1 +0,0 @@
-../gcc-4.7.3

config/Compiler.d/mpi.conf

@@ -1 +0,0 @@
-../openmpi-1.6.5

config/HDF5.d/Compiler.conf

@@ -1 +0,0 @@
-../Compiler.conf

config/HDF5.d/HDF5.conf

@@ -1 +0,0 @@
-../HDF5.conf

config/HDF5.d/MPI.conf

@@ -1 +0,0 @@
-../MPI.conf

config/HDF5_serial.d/compiler.conf

@@ -1 +0,0 @@
-../gcc-4.7.3

config/HDF5_serial.d/hdf5.conf

@@ -1 +0,0 @@
-../hdf5_serial-1.8.12

config/Libraries.d/Compiler.conf

@@ -1 +0,0 @@
-../Compiler.conf

config/MPI.d/Compiler.conf

@@ -1 +0,0 @@
-../Compiler.conf

config/MPI.d/HDF5.conf

@@ -1 +0,0 @@
-../HDF5.conf

config/MPI.d/MPI.conf

@@ -1 +0,0 @@
-../MPI.conf

config/Programming.d/Compiler.conf

@@ -1 +0,0 @@
-../gcc-4.7.3

config/Tools.d/Compiler.conf

@@ -1 +0,0 @@
-../Compiler.conf

config/families.d/HDF5_serial.conf

@@ -0,0 +1 @@
+hdf5_serial-1.8.12

lib/libem.bash

@@ -195,28 +195,22 @@ function _load_build_dependencies() {
 	done
 }
 
-function em.load_family() {
+
+function em.add_to_family() {
 	if [[ -z ${1} ]]; then
-		printf "${FUNCNAME}: Missing family argument"
-		exit 42
+		die 42 "${FUNCNAME}: Missing family argument."
 	fi
 	if [[ ! -d ${EM_ETCDIR}/${1} ]]; then
-		printf "${FUNCNAME}: ${1}: family does not exist."
-		exit 42
+		dir 43 "${1}: family does not exist."
 	fi
-
-	for f in "${CONFIG_DIR}/${1}.d/"*.conf; do
+	EM_FAMILY=$1
+	source "${CONFIG_DIR}/versions.conf"
+	for f in "${CONFIG_DIR}/families.d/"*.conf; do
 		source "${f}"
 	done
 	eval ${ENVIRONMENT_ARGS}
 }
 
-function em.add_to_family() {
-	EM_FAMILY=$1
-	source "${CONFIG_DIR}/versions.conf"
-	em.load_family "$1"
-}
-
 function em.set_runtime_dependencies() {
 	EM_DEPENDENCIES=("$@")
 }

scripts/H5root.build

@@ -16,7 +16,6 @@ function em.configure() {
 }
 
 em.add_to_family 'Tools'
-em.load_family 'Programming'
 em.set_runtime_dependencies "${COMPILER}" 'root'
 em.set_build_dependencies 'autoconf' 'automake' 'libtool' "${COMPILER}" 'hdf5_serial' 'H5hut_serial' 'root'
 em.make_all

scripts/OPAL.build

@@ -11,7 +11,6 @@ function em.configure() {
 }
 
 em.add_to_family 'Tools'
-em.load_family 'HDF5'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
 em.make_all