Index: mini-mol/Makefile.am
===================================================================
--- mini-mol/Makefile.am	(revision 555)
+++ mini-mol/Makefile.am	(working copy)
@@ -32,8 +32,9 @@
 testminimol_SOURCES = testminimol.cc
 
 libcoot_mini_mol_la_SOURCES =  mini-mol.cc mini-mol-utils.cc
+libcoot_mini_mol_la_LIBADD = \
+	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
+	$(CLIPPER_LIBS)
 
 testminimol_LDADD = libcoot-mini-mol.la \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
-	$(top_builddir)/coot-utils/libcoot-utils.la \
-	$(CLIPPER_LIBS) $(MMDB_LIBS)
+	$(MMDB_LIBS)
Index: coords/Makefile.am
===================================================================
--- coords/Makefile.am	(revision 555)
+++ coords/Makefile.am	(working copy)
@@ -37,4 +37,6 @@
 libcoot_coords_la_SOURCES =  Bond_lines.cc Cartesian.cc cos-sin.cc \
 		 mmdb-extras.cc utils.cc mmdb.cc mmdb-crystal.cc \
 		 Bond_lines_ext.cc coot-close.cc
-
+libcoot_coords_la_LIBADD = \
+	$(top_builddir)/coot-utils/libcoot-shelx.la \
+	$(top_builddir)/mini-mol/libcoot-mini-mol.la
Index: ligand/Makefile.am
===================================================================
--- ligand/Makefile.am	(revision 555)
+++ ligand/Makefile.am	(working copy)
@@ -44,6 +44,16 @@
 	wiggly-ligand.cc monomer-utils.cc dunbrack.cc chi-angles-autogen.cc   \
 	chi-angles.cc helix-placement.cc rigid-body.cc ideal-rna.cc           \
 	richardson-rotamers.cc richardson-rotamer.cc rotamer.cc
+libcoot_ligand_la_LIBADD = \
+	$(top_builddir)/ideal/libcoot-ideal.la       \
+	$(top_builddir)/coords/libcoot-coords.la           \
+	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
+	$(top_builddir)/coot-utils/libcoot-map-utils.la    \
+	$(top_builddir)/db-main/libcoot-db-main.la         \
+	$(top_builddir)/coot-utils/libcoot-shelx.la        \
+	$(top_builddir)/geometry/libcoot-geometry.la       \
+	$(top_builddir)/coot-utils/libcoot-coord-utils.la  \
+	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la
 
 AM_CXXFLAGS = \
 	-DPKGDATADIR='"$(pkgdatadir)"' \
@@ -61,35 +71,17 @@
 test_random_SOURCES = test-random.cc
 test_random_LDADD = \
 	./libcoot-ligand.la \
-	$(top_builddir)/ideal/libcoot-ideal.la       \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la \
-	$(top_builddir)/coords/libcoot-coords.la           \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la    \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
-	$(top_builddir)/coot-utils/libcoot-shelx.la        \
-	$(top_builddir)/geometry/libcoot-geometry.la       \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la       \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la  \
 	$(top_builddir)/coot-utils/libcoot-utils.la        \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la    \
 	$(top_builddir)/compat/libcoot-compat.la           \
 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
 test_helix_placement_LDADD = \
 	./libcoot-ligand.la \
-	$(top_builddir)/ideal/libcoot-ideal.la       \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la \
-	$(top_builddir)/coords/libcoot-coords.la           \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la    \
-	$(top_builddir)/coot-utils/libcoot-shelx.la        \
-	$(top_builddir)/geometry/libcoot-geometry.la       \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la       \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la  \
 	$(top_builddir)/coot-utils/libcoot-utils.la        \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la    \
 	$(top_builddir)/compat/libcoot-compat.la           \
 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
@@ -97,19 +89,10 @@
 
 test_fffear_in_coot_LDADD = \
 	./libcoot-ligand.la \
-	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coords/libcoot-coords.la          \
-	$(top_builddir)/coot-utils/libcoot-shelx.la       \
-	$(top_builddir)/geometry/libcoot-geometry.la      \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-map-heavy.la   \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
 	$(top_builddir)/compat/libcoot-compat.la          \
 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
@@ -121,33 +104,15 @@
 
 findligand_real_LDADD = \
 	./libcoot-ligand.la                          \
-	$(top_builddir)/ideal/libcoot-ideal.la       \
-	$(top_builddir)/geometry/libcoot-geometry.la \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la \
-	$(top_builddir)/coords/libcoot-coords.la     \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
-	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/compat/libcoot-compat.la          \
 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
 findwaters_real_LDADD = \
 	./libcoot-ligand.la                               \
-	$(top_builddir)/ideal/libcoot-ideal.la            \
-	$(top_builddir)/geometry/libcoot-geometry.la      \
-	$(top_builddir)/coords/libcoot-coords.la          \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
-	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/compat/libcoot-compat.la          \
 	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
@@ -168,17 +133,8 @@
 testdunbrack_SOURCES = testdunbrack.cc
 
 testdunbrack_LDADD = ./libcoot-ligand.la \
-	$(top_builddir)/ideal/libcoot-ideal.la       \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la \
-	$(top_builddir)/geometry/libcoot-geometry.la \
-	$(top_builddir)/coords/libcoot-coords.la           \
-	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la    \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
-	$(top_builddir)/db-main/libcoot-db-main.la         \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la  \
 	$(top_builddir)/coot-utils/libcoot-utils.la        \
-	$(top_builddir)/coot-utils/libcoot-shelx.la       \
         $(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
 
 # lib coot-coords depends on mmdb, even though Cartesian doesn't
Index: analysis/Makefile.am
===================================================================
--- analysis/Makefile.am	(revision 555)
+++ analysis/Makefile.am	(working copy)
@@ -9,6 +9,7 @@
 	$(MMDB_CXXFLAGS)
 
 libcoot_analysis_la_SOURCES = bfkurt.cc
+libcoot_analysis_la_LIBADD = $(top_builddir)/coot-utils/libcoot-coord-utils.la
 
 bin_PROGRAMS = bfactan
 
@@ -16,7 +17,6 @@
 
 bfactan_LDADD = \
 	libcoot-analysis.la 					\
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la 	\
 	$(top_builddir)/coot-utils/libcoot-utils.la 		\
 	$(top_builddir)/geometry/libcoot-geometry.la    	\
 	$(CLIPPER_LIBS) 	\
Index: skeleton/Makefile.am
===================================================================
--- skeleton/Makefile.am	(revision 555)
+++ skeleton/Makefile.am	(working copy)
@@ -36,8 +36,8 @@
 
 
 libcoot_skeleton_la_SOURCES = $(libskeleton_a_sources)
+libcoot_skeleton_la_LIBADD = ../atom-utils/libcoot-atomutils.la
 
-
 # bin_PROGRAMS = ncssearch test_various test_torsion test_theta_2
 
 # ncssearch_SOURCES = ncs-search.cc ncs-search.h
Index: coot-surface/Makefile.am
===================================================================
--- coot-surface/Makefile.am	(revision 555)
+++ coot-surface/Makefile.am	(working copy)
@@ -25,3 +25,4 @@
 
 libcoot_surface_la_SOURCES = \
 	 coot-surface.cc coot-surface.hh rgbreps.cc rgbreps.h
+libcoot_surface_la_LIBADD = $(top_builddir)/surface/libccp4mg-surface.la
Index: high-res/Makefile.am
===================================================================
--- high-res/Makefile.am	(revision 555)
+++ high-res/Makefile.am	(working copy)
@@ -39,13 +39,16 @@
 
 libcoot_high_res_la_SOURCES = high-res.cc coot-atom-graph.cc residue-distortions.cc \
 	sequence-assignment.cc
+libcoot_high_res_la_LIBADD = \
+	$(top_builddir)/ligand/libcoot-ligand.la \
+	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
+	$(CLIPPER_LIBS) $(MMDB_LIBS)
 
 noinst_PROGRAMS = testatomgraph tracehighres testseqalign testseqassignment globularize_protein
 
 testatomgraph_SOURCES = test-atom-graph.cc
 
 testatomgraph_LDADD =  libcoot-high-res.la                \
-	$(top_builddir)/ligand/libcoot-ligand.la          \
 	$(top_builddir)/db-main/libcoot-db-main.la        \
 	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
@@ -53,90 +56,73 @@
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
 	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
 	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
 	$(top_builddir)/compat/libcoot-compat.la          \
-	$(GSL_LIBS)			                  \
-	$(CLIPPER_LIBS)
+	$(GSL_LIBS)
 
 testseqassignment_SOURCES = testseqassignment.cc
 testseqassignment_LDADD = libcoot-high-res.la             \
-	$(top_builddir)/ligand/libcoot-ligand.la          \
 	$(top_builddir)/db-main/libcoot-db-main.la        \
 	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
 	$(top_builddir)/coords/libcoot-coords.la          \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
 	$(top_builddir)/compat/libcoot-compat.la          \
 	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
-	$(GSL_LIBS)				          \
-	$(CLIPPER_LIBS)
+	$(GSL_LIBS)
 
 # tracehighres_LDFLAGS = -static 
 tracehighres_SOURCES = trace-high-res.cc
 tracehighres_LDADD = libcoot-high-res.la                  \
-	$(top_builddir)/ligand/libcoot-ligand.la          \
 	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/db-main/libcoot-db-main.la        \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
 	$(top_builddir)/coords/libcoot-coords.la          \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
 	$(top_builddir)/compat/libcoot-compat.la          \
 	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
-	$(GSL_LIBS)				          \
-	$(CLIPPER_LIBS)
+	$(GSL_LIBS)
 
-
 testseqalign_SOURCES = testseqalign.cc
 
 # why do we need to link with all this (junk)?
 testseqalign_LDADD = libcoot-high-res.la                  \
-	$(top_builddir)/ligand/libcoot-ligand.la          \
 	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/db-main/libcoot-db-main.la        \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
 	$(top_builddir)/coords/libcoot-coords.la          \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
 	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
 	$(top_builddir)/compat/libcoot-compat.la          \
-	$(GSL_LIBS)				          \
-	$(CLIPPER_LIBS)
+	$(GSL_LIBS)
 
-
 globularize_protein_SOURCES = globularize.cc
 
 globularize_protein_LDADD = libcoot-high-res.la           \
-	$(top_builddir)/ligand/libcoot-ligand.la          \
 	$(top_builddir)/db-main/libcoot-db-main.la        \
 	$(top_builddir)/ideal/libcoot-ideal.la            \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
 	$(top_builddir)/coords/libcoot-coords.la          \
 	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-map-utils.la   \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
 	$(top_builddir)/coot-utils/libcoot-shelx.la       \
 	$(top_builddir)/coot-utils/libcoot-utils.la       \
 	$(top_builddir)/ccp4mg-utils/libccp4mg-utils.la   \
 	$(top_builddir)/compat/libcoot-compat.la          \
-	$(GSL_LIBS)				          \
-	$(CLIPPER_LIBS)
+	$(GSL_LIBS)
 
-
Index: cootaneer/Makefile.am
===================================================================
--- cootaneer/Makefile.am	(revision 555)
+++ cootaneer/Makefile.am	(working copy)
@@ -34,6 +34,7 @@
 	buccaneer-sequence.cpp cootaneer-sequence.cpp \
 	buccaneer-lib.h buccaneer-prot.h \
 	buccaneer-sequence.h cootaneer-sequence.h
+libcootaneer_la_LIBADD = $(CLIPPER_LIBS)
 
 subpkgdatadir = $(pkgdatadir)
 subpkgdata_DATA = cootaneer-llk-2.40.dat 
Index: geometry/Makefile.am
===================================================================
--- geometry/Makefile.am	(revision 555)
+++ geometry/Makefile.am	(working copy)
@@ -34,6 +34,9 @@
 libcoot_geometry_a_sources = protein-geometry.cc protein-geometry-mmdb.cc
 
 libcoot_geometry_la_SOURCES = $(libcoot_geometry_a_sources)
+libcoot_geometry_la_LIBADD = \
+	$(top_builddir)/coot-utils/libcoot-utils.la \
+	$(CLIPPER_LIBS) $(MMDB_LIBS)
 
 # libcoot_geometry_la_CXXFLAGS = -g -O1
 
@@ -41,6 +44,4 @@
 
 test_geometry_SOURCES = test-geometry.cc
 
-test_geometry_LDADD = ./libcoot-geometry.la         \
-        $(top_builddir)/coot-utils/libcoot-utils.la \
-	$(CLIPPER_LIBS) $(MMDB_LIBS)
+test_geometry_LDADD = ./libcoot-geometry.la
Index: ideal/Makefile.am
===================================================================
--- ideal/Makefile.am	(revision 555)
+++ ideal/Makefile.am	(working copy)
@@ -44,6 +44,12 @@
 AM_CXXFLAGS = $(COOT_GSL_FLAGS) $(GSL_CFLAGS)
 
 libcoot_ideal_la_SOURCES = simple-restraint.cc  pepflip.cc regularize-minimol.cc
+libcoot_ideal_la_LIBADD = \
+	$(top_builddir)/coot-utils/libcoot-utils.la       \
+	$(top_builddir)/mini-mol/libcoot-mini-mol.la       \
+	$(top_builddir)/coot-utils/libcoot-shelx.la       \
+	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
+	$(GSL_LIBS)
 
 noinst_PROGRAMS = test-indexing with-geometry with-map
 # bin_PROGRAMS = 
@@ -61,32 +67,20 @@
 with_geometry_LDADD = \
         ./libcoot-ideal.la                                \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
-	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
 	$(top_builddir)/coords/libcoot-coords.la          \
-	$(top_builddir)/coot-utils/libcoot-shelx.la       \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
-	$(top_builddir)/coot-utils/libcoot-utils.la       \
-	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
+	$(CLIPPER_LIBS) $(MMDB_LIBS)
 
 with_map_LDADD =  \
         ./libcoot-ideal.la                                 \
 	$(top_builddir)/geometry/libcoot-geometry.la       \
-	$(top_builddir)/mini-mol/libcoot-mini-mol.la       \
 	$(top_builddir)/coords/libcoot-coords.la           \
-	$(top_builddir)/coot-utils/libcoot-shelx.la        \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
-	$(top_builddir)/coot-utils/libcoot-coord-utils.la  \
-	$(top_builddir)/coot-utils/libcoot-utils.la        \
-        $(top_builddir)/compat/libcoot-compat.la           \
-	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
+	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
+	$(CLIPPER_LIBS) $(MMDB_LIBS)
 
 test_indexing_LDADD = \
         ./libcoot-ideal.la                                \
 	$(top_builddir)/geometry/libcoot-geometry.la      \
-	$(top_builddir)/mini-mol/libcoot-mini-mol.la      \
-	$(top_builddir)/coot-utils/libcoot-coord-extras.la \
 	$(top_builddir)/coot-utils/libcoot-coord-utils.la \
-	$(top_builddir)/coot-utils/libcoot-utils.la       \
-	$(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
+	$(CLIPPER_LIBS) $(MMDB_LIBS)
 
Index: tw/Makefile.am
===================================================================
--- tw/Makefile.am	(revision 555)
+++ tw/Makefile.am	(working copy)
@@ -39,15 +39,15 @@
 include_HEADERS = coot-tw.hh
 
 libcoot_tw_la_SOURCES = tw.cc
+libcoot_tw_la_LIBADD = \
+	$(GTKCANVAS_LIBS) \
+	@GTK_LIBS@
 
 noinst_PROGRAMS = coot-tiddly
 
 coot_tiddly_SOURCES = tiddly.cc
 
-coot_tiddly_LDADD = libcoot-tw.la \
-	$(GTKCANVAS_LIBS) \
-	@GTK_LIBS@
+coot_tiddly_LDADD = libcoot-tw.la
 
-
 # cootsound_LDADD = -L/sw/lib -lvorbisfile -logg -lao
 
Index: coot-utils/Makefile.am
===================================================================
--- coot-utils/Makefile.am	(revision 555)
+++ coot-utils/Makefile.am	(working copy)
@@ -49,9 +49,11 @@
 
 # for pure coordinates (mmdb) things
 libcoot_coord_utils_la_SOURCES = coot-coord-utils.cc 
+libcoot_coord_utils_la_LIBADD = $(CLIPPER_LIBS) libcoot-utils.la
 
 # shelx
 libcoot_shelx_la_SOURCES = coot-shelx-ins.cc
+libcoot_shelx_la_LIBADD = $(MMDB_LIBS) libcoot-coord-utils.la
 
 # for non-simple coordinates things
 libcoot_coord_extras_la_SOURCES = coot-coord-extras.cc coot-coord-lsq.cc
@@ -61,21 +63,20 @@
 
 # for map things that need mmdb, clipper, gsl and other things
 libcoot_map_heavy_la_SOURCES = coot-map-heavy.cc coot-fffear.cc
+libcoot_map_heavy_la_LIBADD = $(GSL_LIBS)
 
 noinst_PROGRAMS = testshelxreader testcootutils
 
 testshelxreader_SOURCES = test-shelx-reader.cc
 testshelxreader_LDADD = \
 	./libcoot-shelx.la \
-	./libcoot-coord-utils.la \
-	./libcoot-utils.la \
-	$(CLIPPER_LIBS) $(MMDB_LIBS)
+	./libcoot-utils.la
 
 testcootutils_SOURCES = test-utils.cc
 testcootutils_LDADD = \
 	./libcoot-shelx.la \
 	./libcoot-coord-utils.la \
 	./libcoot-utils.la \
-	$(CLIPPER_LIBS) $(MMDB_LIBS)
+	$(MMDB_LIBS)
 
 
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 555)
+++ Makefile.am	(working copy)
@@ -25,10 +25,10 @@
 
 # see configure.in for po intl 
 SUBDIRS = auxil scheme python macros compat coot-utils surface coot-surface \
-	skeleton ccp4mg-utils density-contour coords angles \
-	mini-mol db-main  geometry  \
+	atom-utils skeleton ccp4mg-utils density-contour mini-mol coords angles \
+	db-main  geometry  \
 	ideal ligand high-res build greg-tests \
-	analysis sequence-view tw atom-utils cootaneer src doc 
+	analysis sequence-view tw cootaneer src doc 
 
 # po, no po today.