From 200b5e5cde927517197c73d76c7206d49fa50b2b Mon Sep 17 00:00:00 2001 From: David van der Spoel Date: Tue, 14 Jan 2014 20:54:49 +0100 Subject: [PATCH] This patch moves preprocessing headers to gmxpreprocess In the move to depopulate the legacyheaders directory http://redmine.gromacs.org/issues/1415 this is a small contribution. Change-Id: I209f6e5a1e76f2d3ea072f66eca9ae1f59bc0d42 --- src/gromacs/fileio/tpxio.c | 1 - src/gromacs/{legacyheaders => gmxlib}/topsort.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/gen_ad.h | 0 src/gromacs/{gmxlib => gmxpreprocess}/gmxcpp.c | 0 src/gromacs/{legacyheaders => gmxpreprocess}/gmxcpp.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/gpp_atomtype.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/gpp_nextnb.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/hackblock.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/pdb2top.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/resall.h | 0 src/gromacs/{legacyheaders => gmxpreprocess}/toputil.h | 0 src/gromacs/mdlib/domdec_top.c | 2 +- src/programs/mdrun/md.c | 1 - 13 files changed, 1 insertion(+), 3 deletions(-) rename src/gromacs/{legacyheaders => gmxlib}/topsort.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/gen_ad.h (100%) rename src/gromacs/{gmxlib => gmxpreprocess}/gmxcpp.c (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/gmxcpp.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/gpp_atomtype.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/gpp_nextnb.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/hackblock.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/pdb2top.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/resall.h (100%) rename src/gromacs/{legacyheaders => gmxpreprocess}/toputil.h (100%) diff --git a/src/gromacs/fileio/tpxio.c b/src/gromacs/fileio/tpxio.c index e921e0b956..95b649c081 100644 --- a/src/gromacs/fileio/tpxio.c +++ b/src/gromacs/fileio/tpxio.c @@ -51,7 +51,6 @@ #include "futil.h" #include "filenm.h" #include "gmxfio.h" -#include "topsort.h" #include "tpxio.h" #include "txtdump.h" #include "confio.h" diff --git a/src/gromacs/legacyheaders/topsort.h b/src/gromacs/gmxlib/topsort.h similarity index 100% rename from src/gromacs/legacyheaders/topsort.h rename to src/gromacs/gmxlib/topsort.h diff --git a/src/gromacs/legacyheaders/gen_ad.h b/src/gromacs/gmxpreprocess/gen_ad.h similarity index 100% rename from src/gromacs/legacyheaders/gen_ad.h rename to src/gromacs/gmxpreprocess/gen_ad.h diff --git a/src/gromacs/gmxlib/gmxcpp.c b/src/gromacs/gmxpreprocess/gmxcpp.c similarity index 100% rename from src/gromacs/gmxlib/gmxcpp.c rename to src/gromacs/gmxpreprocess/gmxcpp.c diff --git a/src/gromacs/legacyheaders/gmxcpp.h b/src/gromacs/gmxpreprocess/gmxcpp.h similarity index 100% rename from src/gromacs/legacyheaders/gmxcpp.h rename to src/gromacs/gmxpreprocess/gmxcpp.h diff --git a/src/gromacs/legacyheaders/gpp_atomtype.h b/src/gromacs/gmxpreprocess/gpp_atomtype.h similarity index 100% rename from src/gromacs/legacyheaders/gpp_atomtype.h rename to src/gromacs/gmxpreprocess/gpp_atomtype.h diff --git a/src/gromacs/legacyheaders/gpp_nextnb.h b/src/gromacs/gmxpreprocess/gpp_nextnb.h similarity index 100% rename from src/gromacs/legacyheaders/gpp_nextnb.h rename to src/gromacs/gmxpreprocess/gpp_nextnb.h diff --git a/src/gromacs/legacyheaders/hackblock.h b/src/gromacs/gmxpreprocess/hackblock.h similarity index 100% rename from src/gromacs/legacyheaders/hackblock.h rename to src/gromacs/gmxpreprocess/hackblock.h diff --git a/src/gromacs/legacyheaders/pdb2top.h b/src/gromacs/gmxpreprocess/pdb2top.h similarity index 100% rename from src/gromacs/legacyheaders/pdb2top.h rename to src/gromacs/gmxpreprocess/pdb2top.h diff --git a/src/gromacs/legacyheaders/resall.h b/src/gromacs/gmxpreprocess/resall.h similarity index 100% rename from src/gromacs/legacyheaders/resall.h rename to src/gromacs/gmxpreprocess/resall.h diff --git a/src/gromacs/legacyheaders/toputil.h b/src/gromacs/gmxpreprocess/toputil.h similarity index 100% rename from src/gromacs/legacyheaders/toputil.h rename to src/gromacs/gmxpreprocess/toputil.h diff --git a/src/gromacs/mdlib/domdec_top.c b/src/gromacs/mdlib/domdec_top.c index 06032c6107..15037b01c6 100644 --- a/src/gromacs/mdlib/domdec_top.c +++ b/src/gromacs/mdlib/domdec_top.c @@ -48,7 +48,7 @@ #include "pbc.h" #include "chargegroup.h" #include "gmx_random.h" -#include "topsort.h" +#include "gromacs/gmxlib/topsort.h" #include "mtop_util.h" #include "mshift.h" #include "vsite.h" diff --git a/src/programs/mdrun/md.c b/src/programs/mdrun/md.c index 4d11e49765..df64572da6 100644 --- a/src/programs/mdrun/md.c +++ b/src/programs/mdrun/md.c @@ -67,7 +67,6 @@ #include "domdec.h" #include "domdec_network.h" #include "partdec.h" -#include "topsort.h" #include "coulomb.h" #include "constr.h" #include "shellfc.h" -- 2.22.0