From eaeb49c22e3e8a30db78a2d11e31237c8d1f1b9c Mon Sep 17 00:00:00 2001
From: Nicholas Malaya <nicholas.malaya@gmail.com>
Date: Sat, 4 Feb 2012 00:23:34 +0000
Subject: [PATCH] [cantera]: back to where we started

---
 Cantera/cxx/include/Cantera.h                    | 14 +++++++-------
 Cantera/ext/f2c_libs/Makefile.am                 | 12 +++++++-----
 Cantera/src/thermo/Makefile.am                   |  2 +-
 test_problems/cathermo/DH_graph_1/DH_graph_1.cpp |  5 ++---
 test_problems/cathermo/DH_graph_1/Makefile.am    |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Cantera/cxx/include/Cantera.h b/Cantera/cxx/include/Cantera.h
index 0093fe998..e4ef71e45 100755
--- a/Cantera/cxx/include/Cantera.h
+++ b/Cantera/cxx/include/Cantera.h
@@ -23,28 +23,28 @@ namespace Cantera_CXX{ }
 
 using namespace Cantera_CXX;
 
-#include "kernel/ct_defs.h"
+#include "ct_defs.h"
 
 // some useful functions
-#include "kernel/global.h"
+#include "global.h"
 
 // the CanteraError exception class
-#include "kernel/ctexceptions.h"
+#include "ctexceptions.h"
 
 //
 //#include "kernel/importCTML.h"
 
 // The Cantera logger class
-#include "kernel/logger.h"
+#include "logger.h"
 
 // Include the timer
-#include "kernel/clockWC.h"
+#include "clockWC.h"
 
 // Include routines for reading and writing XML files
-#include "kernel/xml.h"
+#include "xml.h"
 
 // Include string utility routines
-#include "kernel/stringUtils.h"
+#include "stringUtils.h"
 
 #endif
 
diff --git a/Cantera/ext/f2c_libs/Makefile.am b/Cantera/ext/f2c_libs/Makefile.am
index 85adc430b..3f3bef961 100644
--- a/Cantera/ext/f2c_libs/Makefile.am
+++ b/Cantera/ext/f2c_libs/Makefile.am
@@ -49,13 +49,15 @@ library_include_HEADERS = $(h_sources)
 # Cantera Converters C/C++ library
 #-----------------------
 
-__top_builddir__build_lib_libctf2c_la_LDFLAGS      = $(all_libraries) -release $(GENERIC_RELEASE)
-__top_builddir__build_lib_libctf2c_la_SOURCES      = $(cc_sources) $(h_sources)
-
-CLEANFILES = *.o
-
 # header file accumulation
 all:
 	@echo copying headers $<
 	cp sysdep1.h0 sysdep1.h
+	cp signal1.h0 signal1.h
 	cp $(h_sources) $(top_builddir)/build/include/
+
+
+__top_builddir__build_lib_libctf2c_la_LDFLAGS      = $(all_libraries) -release $(GENERIC_RELEASE)
+__top_builddir__build_lib_libctf2c_la_SOURCES      = $(cc_sources) $(h_sources)
+
+CLEANFILES = *.o
diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am
index 13a5076dc..d8fdb1c63 100644
--- a/Cantera/src/thermo/Makefile.am
+++ b/Cantera/src/thermo/Makefile.am
@@ -19,7 +19,7 @@ h_sources  = State.h Elements.h Constituents.h Phase.h mix_defs.h  \
 	     PDSS.h HMWSoln.h WaterSSTP.h MetalSHEelectrons.h      \
 	     IdealSolidSolnPhase.h StoichSubstanceSSTP.h           \
              SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h   \
-             MargulesVPSSTP.h StoichSubstance.h
+             MargulesVPSSTP.h StoichSubstance.h electrolytes.h
 
 cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp             \
              ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp      \
diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
index f20d4f373..00000ab0f 100644
--- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
@@ -15,10 +15,9 @@
 #include "DebyeHuckel.h"
 #else
 #include "Cantera.h"
-#include "kernel/logger.h"
-#include "kernel/DebyeHuckel.h"
+#include "logger.h"
+#include "DebyeHuckel.h"
 #endif
-
 #include <cstdio>
 
 using namespace std;
diff --git a/test_problems/cathermo/DH_graph_1/Makefile.am b/test_problems/cathermo/DH_graph_1/Makefile.am
index c0c7269d1..7a05008fd 100644
--- a/test_problems/cathermo/DH_graph_1/Makefile.am
+++ b/test_problems/cathermo/DH_graph_1/Makefile.am
@@ -1,6 +1,6 @@
 cc_sources = DH_graph_1.cpp
 
-INC                  = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
+INC                  = -I. -I$(top_builddir)/build/include/
 AM_CPPFLAGS          = $(INC)
 AM_CXXFLAGS          = $(AM_CPPFLAGS)