--- ccp4/Makefile.am.orig Wed Nov 5 13:01:24 2003 +++ ccp4/Makefile.am Wed Nov 5 13:01:37 2003 @@ -6,13 +6,8 @@ #shared lib_LTLIBRARIES = libclipper-ccp4.la -#non shared -lib_LIBRARIES = libclipper-ccp4.a - libclipper_ccp4_la_SOURCES = \ ccp4_mtz_types.cpp ccp4_mtz_io.cpp ccp4_map_io.cpp - -libclipper_ccp4_a_SOURCES = $(libclipper_ccp4_la_SOURCES) library_include_HEADERS = \ ccp4_map_io.h ccp4_mtz_io.h ccp4_mtz_types.h --- cctbx/Makefile.am.orig Wed Nov 5 13:01:51 2003 +++ cctbx/Makefile.am Wed Nov 5 13:02:01 2003 @@ -3,16 +3,11 @@ libclipper_cctbx_la_SOURCES = clipper_cctbx.cpp -libclipper_cctbx_a_SOURCES = $(libclipper_cctbx_la_SOURCES) - library_include_HEADERS = clipper_cctbx.h library_includedir=$(pkgincludedir)/cctbx #shared lib_LTLIBRARIES = libclipper-cctbx.la - -#non shared -lib_LIBRARIES = libclipper-cctbx.a libclipper_cctbx_la_LDFLAGS = -version-info 1:0 --- cif/Makefile.am.orig Wed Nov 5 13:02:11 2003 +++ cif/Makefile.am Wed Nov 5 13:02:19 2003 @@ -2,10 +2,8 @@ # For licence conditions, see the file COPYING in the distribution. lib_LTLIBRARIES = libclipper-cif.la -lib_LIBRARIES = libclipper-cif.a libclipper_cif_la_SOURCES = cif_data_io.cpp -libclipper_cif_a_SOURCES = $(libclipper_cif_la_SOURCES) library_include_HEADERS = cif_data_io.h --- contrib/Makefile.am.orig Wed Nov 5 13:02:28 2003 +++ contrib/Makefile.am Wed Nov 5 13:02:39 2003 @@ -4,8 +4,6 @@ libclipper_contrib_la_SOURCES = function_object_bases.cpp \ sfcalc.cpp edcalc.cpp fffear.cpp mapfilter.cpp skeleton.cpp -libclipper_contrib_a_SOURCES = $(libclipper_contrib_la_SOURCES) - library_include_HEADERS = \ edcalc.h function_object_bases.h skeleton.h \ fffear.h mapfilter.h sfcalc.h @@ -14,9 +12,6 @@ #shared lib_LTLIBRARIES = libclipper-contrib.la - -#non shared -lib_LIBRARIES = libclipper-contrib.a INCLUDES = $(FFTW_CXXFLAGS) DIST_EXTRA = clipper_contrib.dox --- core/Makefile.am.orig Wed Nov 5 13:00:25 2003 +++ core/Makefile.am Wed Nov 5 13:00:46 2003 @@ -17,7 +17,6 @@ container.cpp container_types.cpp container_hkl.cpp \ container_map.cpp -libclipper_core_a_SOURCES = $(libclipper_core_la_SOURCES) library_includedir=$(pkgincludedir)/core library_include_HEADERS = \ @@ -36,7 +35,4 @@ #shared lib_LTLIBRARIES = libclipper-core.la - -#non shared -lib_LIBRARIES = libclipper-core.a --- minimol/Makefile.am.orig Wed Nov 5 13:02:50 2003 +++ minimol/Makefile.am Wed Nov 5 13:02:59 2003 @@ -8,13 +8,8 @@ #shared lib_LTLIBRARIES = libclipper-minimol.la -#non shared -lib_LIBRARIES = libclipper-minimol.a - libclipper_minimol_la_SOURCES = container_minimol.cpp minimol.cpp \ minimol_io.cpp - -libclipper_minimol_a_SOURCES = $(libclipper_minimol_la_SOURCES) library_include_HEADERS = container_minimol.h minimol.h \ minimol_io.h --- mmdb/Makefile.am.orig Wed Nov 5 13:04:19 2003 +++ mmdb/Makefile.am Wed Nov 5 13:04:26 2003 @@ -6,12 +6,7 @@ #shared lib_LTLIBRARIES = libclipper-mmdb.la -#non shared -lib_LIBRARIES = libclipper-mmdb.a - libclipper_mmdb_la_SOURCES = clipper_mmdb.cpp - -libclipper_mmdb_a_SOURCES = $(libclipper_mmdb_la_SOURCES) library_include_HEADERS = clipper_mmdb.h --- mmdbold/Makefile.am.orig Wed Nov 5 13:04:33 2003 +++ mmdbold/Makefile.am Wed Nov 5 13:04:39 2003 @@ -4,13 +4,8 @@ #shared lib_LTLIBRARIES = libclipper-mmdbold.la -#non shared -lib_LIBRARIES = libclipper-mmdbold.a - libclipper_mmdbold_la_SOURCES = clipper_mmdb.cpp \ clipper_mmdb_wrapper.cpp clipper_mmdb_types.cpp container_mmdb.cpp - -libclipper_mmdbold_a_SOURCES = $(libclipper_mmdbold_la_SOURCES) library_include_HEADERS = clipper_mmdb.h clipper_mmdb_wrapper.h \ clipper_mmdb_types.h container_mmdb.h --- phs/Makefile.am.orig Wed Nov 5 13:03:46 2003 +++ phs/Makefile.am Wed Nov 5 13:03:52 2003 @@ -4,12 +4,7 @@ #shared lib_LTLIBRARIES = libclipper-phs.la -#non shared -lib_LIBRARIES = libclipper-phs.a - libclipper_phs_la_SOURCES = phs_io.cpp - -libclipper_phs_a_SOURCES = $(libclipper_phs_la_SOURCES) library_include_HEADERS = phs_io.h