From 74447ac77d9159541605c7d2897fa223bc7da709 Mon Sep 17 00:00:00 2001
From: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Date: Fri, 26 Aug 2016 09:54:20 +0100
Subject: [PATCH] Further fixes to root Makefile.am for test data install.

---
 Makefile.am             | 36 ++++++++++++++++++++++++-----
 data/filters/LammpsReax | 51 -----------------------------------------
 2 files changed, 30 insertions(+), 57 deletions(-)
 delete mode 100644 data/filters/LammpsReax

diff --git a/Makefile.am b/Makefile.am
index 6b77abd91..dbad2ef74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUFFIXES: .dt
 	sed -e "s:PREFIX:@INSTALLDIR@:" -e "s:VERSION:@VERSION@:" $< > $@
 
 EXTRA_DIST = src/gui/icons/*.* src/gui/freefont/*
-EXTRA_DIST += data/ff/* data/fftesting/* data/filters/* data/fragments/*/* data/partitions/* data/test/*/* data/scripts/* data/external/*
+EXTRA_DIST += data/ff/* data/fftesting/* data/fragments/*/* data/partitions/* data/test/*/* data/scripts/* data/external/*
 EXTRA_DIST += TODO TODO2
 EXTRA_DIST += CMakeLists.txt cmake/* src/CMakeLists.txt src/*/CMakeLists.txt
 EXTRA_DIST += desktop.cmake
@@ -16,14 +16,38 @@ EXTRA_DIST += extra/*
 atendir = $(datadir)/aten
 aten_DATA = src/gui/icons/aten.png
 
-filterdir = $(atendir)/filters
-filter_DATA = data/filters/*
-
 #includesdir = $(atendir)/includes
 #includes_DATA = data/includes/*
 
-testdir = $(atendir)/test
-test_DATA = data/test/*
+testroot = $(atendir)/test
+test01dir = $(testroot)/build
+test01_DATA = $(testroot)/build/*
+test02dir = $(testroot)/ff
+test02_DATA = $(testroot)/ff/*
+test03dir = $(testroot)/forces
+test03_DATA = $(testroot)/forces/*
+test04dir = $(testroot)/io_cif
+test04_DATA = $(testroot)/io_cif/*
+test05dir = $(testroot)/io_csd
+test05_DATA = $(testroot)/io_csd/*
+test06dir = $(testroot)/io_dlputils
+test06_DATA = $(testroot)/io_dlputils/*
+test07dir = $(testroot)/io_epsr
+test07_DATA = $(testroot)/io_epsr/*
+test08dir = $(testroot)/io_gamess
+test08_DATA = $(testroot)/io_gamess/*
+test09dir = $(testroot)/io_msi
+test09_DATA = $(testroot)/io_msi/*
+test10dir = $(testroot)/io_pdb
+test10_DATA = $(testroot)/io_pdb/*
+test11dir = $(testroot)/io_sybylmol2
+test11_DATA = $(testroot)/io_sybylmol2/*
+test12dir = $(testroot)/io_xyz
+test12_DATA = $(testroot)/io_xyz/*
+test13dir = $(testroot)/render
+test13_DATA = $(testroot)/render/*
+test14dir = $(testroot)/typing
+test14_DATA = $(testroot)/typing/*
 
 ffdir = $(atendir)/ff
 ff_DATA = data/ff/*
diff --git a/data/filters/LammpsReax b/data/filters/LammpsReax
deleted file mode 100644
index b1fd84838..000000000
--- a/data/filters/LammpsReax
+++ /dev/null
@@ -1,51 +0,0 @@
-# LAMMPS REAX
-# Created:  12/1/2013
-# Last modified: 12/1/2013
-# ChangeLog:
-# Notes:
-#	data file for ReaxFF in LAMMPS
-
-filter(type="exportmodel", name="LAMMPS_data.input", nickname="lammps", extension="input", glob="*.input", id=22)
-{
-	# Variable declaration
-	int n, el[aten.nElements], nSpecies;
-	string e;
-	double rx,ry,rz;
-	atom i;
-
-	# Grab current model (or frame)
-	model m = aten.frame;
-
-	# Determine number of species (elements) used in model, and create element->species map
-	el = 0;
-	nSpecies = 0;
-	for (i = m.atoms; i; ++i) if (el[i.z] == 0) el[i.z] = ++nSpecies;
-	
-	# Write Header Masses and Atoms sections
-	writeLine("# ReaxFF data file");
-	writeLine("");
-
-	writeLineF("%i  atoms\n",m.nAtoms);
-	writeLineF("%i  atom types\n",nSpecies);
-	writeLine("");
-
-	writeLineF("0 %7.3f  xlo xhi\n",m.cell.a);
-	writeLineF("0 %7.3f  ylo yhi\n",m.cell.b);
-	writeLineF("0 %7.3f  zlo zhi\n",m.cell.c);
-
-	writeLine("");
-
-	# Write atomic species data
-	writeLine("Masses");
-	writeLine("");
-	for (n=1; n<=aten.nElements; n++) if (el[n] != 0) writeLineF("%1i  %7.4f\n",el[n], aten.elements[n].mass);
-
-	writeLine("");
-
-	# Write atomic positions
-	writeLine("Atoms");
-	writeLine("");
-     for (i = m.atoms; i; ++i) writeLineF("%4i %2i %4.1f %8.5f %8.5f %8.5f\n",i.id,el[i.z],i.q,i.rx,i.ry,i.rz);
-
-     #for (i = m.atoms; i; ++i) writeLineF("%4i %2i  0.0  %8.5f %8.5f %8.5f\n",i.id,el[i.z],i.rx,i.ry,i.rz);
-}