From 617305cd1137418e73f6b597664fa0de7e5c298a Mon Sep 17 00:00:00 2001
From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE>
Date: Sat, 20 Jun 2009 14:40:24 +0000
Subject: [PATCH] DG stuff was broken in the presence of per element
 initializers.

---
 Makefile.am.template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.am.template b/Makefile.am.template
index 55b3aeb..d3a9bc6 100644
--- a/Makefile.am.template
+++ b/Makefile.am.template
@@ -36,43 +36,43 @@ libalberta%LIBCODE%_la_LDFLAGS = -version-info 4:0:0
 libSS_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libSS_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-vector
 libVV_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libVV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-Cartesian
 libVC_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libVC_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=1
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=1
 
 # Cartesian-vector
 libCV_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libCV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=1 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=1 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-scalar
 libVS_assemble%LIBCODE%_la_SOURCES = $(VSSV_assemble_sources)
 libVS_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # scalar-vector
 libSV_assemble%LIBCODE%_la_SOURCES = $(VSSV_assemble_sources)
 libSV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 if ALBERTA_USE_GRAPHICS
 lib_LTLIBRARIES += libalberta_gfx%LIBCODE%.la
-- 
GitLab