Reorganize ConfigGraph files (#1491)

* Move configGraph.{h,cc} into the sst/core/model directory and split the file into multiple files.

* Replace includes of sst/core/configGraph.h with sst/core/model/configGraph.h

* Move sst/core/cfgoutput directory to sst/core/model/cfgoutput.  Remove header files for the config output classes from distribution list as there shouldn't be public.

* Move all files in sst/core/model from sst/core/Makefile.am to sst/core/Makefile.inc

Author: feldergast

src/sst/core/Makefile.am

@@ -30,10 +30,6 @@ nobase_dist_sst_HEADERS = \
 	configShared.h \
 	configGraph.h \
 	configGraphOutput.h \
-	cfgoutput/pythonConfigOutput.h \
-	cfgoutput/dotConfigOutput.h \
-	cfgoutput/xmlConfigOutput.h \
-	cfgoutput/jsonConfigOutput.h \
 	decimal_fixedpoint.h \
 	env/envquery.h \
 	env/envconfig.h \
@@ -163,8 +159,7 @@ nobase_dist_sst_HEADERS = \
 	statapi/statnull.h \
 	threadsafe.h \
 	cputimer.h \
-	warnmacros.h \
-	model/element_python.h
+	warnmacros.h
 
 
 deprecated_nobase_dist_sst_headers =
@@ -186,12 +181,7 @@ sst_core_sources = \
 	configBase.cc \
 	configBaseSer.cc \
 	configShared.cc \
-	configGraph.cc \
 	configGraphOutput.cc \
-	cfgoutput/pythonConfigOutput.cc \
-	cfgoutput/dotConfigOutput.cc \
-	cfgoutput/xmlConfigOutput.cc \
-	cfgoutput/jsonConfigOutput.cc \
 	env/envquery.cc \
 	env/envconfig.cc \
 	eli/elibase.cc \

src/sst/core/baseComponent.cc

@@ -14,10 +14,10 @@
 #include "sst/core/baseComponent.h"
 
 #include "sst/core/component.h"
-#include "sst/core/configGraph.h"
 #include "sst/core/factory.h"
 #include "sst/core/link.h"
 #include "sst/core/linkMap.h"
+#include "sst/core/model/configGraph.h"
 #include "sst/core/portModule.h"
 #include "sst/core/profile/clockHandlerProfileTool.h"
 #include "sst/core/profile/eventHandlerProfileTool.h"

src/sst/core/componentInfo.cc

@@ -13,8 +13,8 @@
 
 #include "sst/core/componentInfo.h"
 
-#include "sst/core/configGraph.h"
 #include "sst/core/linkMap.h"
+#include "sst/core/model/configGraph.h"
 #include "sst/core/serialization/serialize.h"
 #include "sst/core/serialization/serializer.h"