Move gstat.h to gmxana/

Remove unnecessary inclusions of gstat.h from outside gmxana/.
Now that the header is no longer used outside gmxana/, move it into that
directory.  Still install the header, since it contains a wide mixture
of stuff, some of which may actually be used by user tools.

This cleans up the include dependency graph considerably, since the
legacyheaders/ directory no longer depends on commandline/.  This was a
source of a cyclic dependency that made the graph layout very confusing.

Change-Id: I3843f2773d6b393e4d260e84478ab559ab8e00d7

diff --git a/src/gromacs/gmxana/CMakeLists.txt b/src/gromacs/gmxana/CMakeLists.txt
index 1eb7c166448215c0a16d39c1b9b7dbce352126d8..45206c3e2eca6ecf3d261d4bf6395d3a62573a78 100644 (file)
--- a/src/gromacs/gmxana/CMakeLists.txt
+++ b/src/gromacs/gmxana/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2013, by the GROMACS development team, led by
+# Copyright (c) 2013,2014, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -34,6 +34,11 @@
 
 file(GLOB GMXANA_SOURCES *.c *.cpp)
 
+set(GMXANA_PUBLIC_HEADERS
+    gstat.h
+    )
+gmx_install_headers(gmxana ${GMXANA_PUBLIC_HEADERS})
+
 set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${GMXANA_SOURCES} PARENT_SCOPE)
 
 if(BUILD_TESTING)

diff --git a/src/gromacs/legacyheaders/gstat.h b/src/gromacs/gmxana/gstat.h
similarity index 98%
rename from src/gromacs/legacyheaders/gstat.h
rename to src/gromacs/gmxana/gstat.h
index 2306e816792fc75d812092785d78e1430f8dd013..e12adf55d15acb32108a82b80e4f17ff14c796f5 100644 (file)
--- a/src/gromacs/legacyheaders/gstat.h
+++ b/src/gromacs/gmxana/gstat.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -34,16 +34,15 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
+#ifndef GMX_GMXANA_GSTAT_H
+#define GMX_GMXANA_GSTAT_H
 
-#ifndef _gstat_h
-#define _gstat_h
-
-#include "typedefs.h"
+#include "../legacyheaders/typedefs.h"
 #include "../commandline/pargs.h"
-#include "oenv.h"
-#include "mshift.h"
-#include "rmpbc.h"
-#include "index.h"
+#include "../legacyheaders/oenv.h"
+#include "../legacyheaders/mshift.h"
+#include "../legacyheaders/rmpbc.h"
+#include "../legacyheaders/index.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gromacs/gmxlib/gbutil.c b/src/gromacs/gmxlib/gbutil.c
index 31a1a6c4e2cbe78885cb5ddc5373e6f65f300389..3d2a1046a4630ae27946175ecf40a3900cf4df68 100644 (file)
--- a/src/gromacs/gmxlib/gbutil.c
+++ b/src/gromacs/gmxlib/gbutil.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -43,7 +43,6 @@
 #include "macros.h"
 #include "vec.h"
 #include "gmx_fatal.h"
-#include "gstat.h"
 #include "pbc.h"
 #include "gbutil.h"
 

diff --git a/src/gromacs/gmxlib/nrjac.c b/src/gromacs/gmxlib/nrjac.c
index cd392aa5090f3d1d5fb750482f135600cbb29332..f0e52f376c399461a2c1a1586e703908de4697a9 100644 (file)
--- a/src/gromacs/gmxlib/nrjac.c
+++ b/src/gromacs/gmxlib/nrjac.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "gstat.h"
 #include "smalloc.h"
 #include "gmx_fatal.h"
 #include "nrjac.h"

diff --git a/src/gromacs/gmxlib/princ.c b/src/gromacs/gmxlib/princ.c
index 006e16ff30cfb8fd2bd6217d8713ebe0ca472e8f..ac319c8a0b98873f6a67260e02e776bfa9817155 100644 (file)
--- a/src/gromacs/gmxlib/princ.c
+++ b/src/gromacs/gmxlib/princ.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2012, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -42,7 +42,6 @@
 #include "typedefs.h"
 #include "vec.h"
 #include "smalloc.h"
-#include "gstat.h"
 #include "nrjac.h"
 #include "txtdump.h"
 #include "princ.h"

diff --git a/src/gromacs/gmxlib/rmpbc.c b/src/gromacs/gmxlib/rmpbc.c
index 8bce3d2f5eef13aa72fefcb86c43a0f6dbfbaef6..aeb3d7ddebbff43582e6aaba29d15fa71fce9f88 100644 (file)
--- a/src/gromacs/gmxlib/rmpbc.c
+++ b/src/gromacs/gmxlib/rmpbc.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -43,10 +43,11 @@
 #include "smalloc.h"
 #include "mshift.h"
 #include "pbc.h"
-#include "gstat.h"
-#include "gromacs/fileio/futil.h"
+#include "rmpbc.h"
 #include "vec.h"
 
+#include "gromacs/fileio/futil.h"
+
 typedef struct {
     int      natoms;
     t_graph *gr;

diff --git a/src/programs/view/manager.cpp b/src/programs/view/manager.cpp
index 20cd24985d79005dbcafff6550c8a33d4aea804b..41da204fdd2d0cec99f8f0eaee2567f3a1178dec 100644 (file)
--- a/src/programs/view/manager.cpp
+++ b/src/programs/view/manager.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -54,7 +54,6 @@
 #include "pbc.h"
 #include "nmol.h"
 #include "copyrite.h"
-#include "gstat.h"
 #include "vec.h"
 #include "string2.h"