...
 
Commits (8)
--- a/geometry/Makefile.am
+++ b/geometry/Makefile.am
@@ -82,7 +82,7 @@
coot_make_shelx_restraints_SOURCES = make-shelx-restraints.cc
-coot_make_shelx_restraints_LDADD = ./libcoot-geometry.la
+coot_make_shelx_restraints_LDADD = ./libcoot-geometry.la ../utils/.libs/libcoot-utils.la -lclipper-core
coot_available_comp_id_SOURCES = available-comp-id.cc
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -637,6 +637,7 @@
$(top_builddir)/utils/libcoot-utils.la \
$(top_builddir)/coot-utils/libcoot-coord-utils.la \
$(top_builddir)/coot-surface/libcoot-surface.la \
+ $(top_builddir)/geometry/libcoot-geometry.la \
$(CLIPPER_LIBS) \
$(MMDB_LIBS) \
$(GLOB_LIBS) \
--- a/compat/coot-getopt.h
+++ b/compat/coot-getopt.h
@@ -145,8 +145,8 @@
errors, only prototype getopt for the GNU C library. */
/* extern int getopt (int __argc, char *const *__argv, const char *__shortopts); as it was 20110816 */
-// #define HACK_THROW_ throw()
-#define HACK_THROW_
+#define HACK_THROW_ throw()
+// #define HACK_THROW_
extern int getopt (int __argc, char *const *__argv, const char *__shortopts) HACK_THROW_;
# else /* not __GNU_LIBRARY__ */
--- a/lbg/Makefile.am
+++ b/lbg/Makefile.am
@@ -80,7 +80,7 @@
# (if that is annoying, then remove it and expand it by hand)
#
lidia_LDADD = \
- ./libcoot-lidia.la $(GLOB_LIBS) $(RDKIT_LIBS) $(L_BOOST_PYTHON)
+ ./libcoot-lidia.la ../lidia-core/.libs/libcoot-lidia-core.la $(GLOB_LIBS) $(RDKIT_LIBS) $(MMDB_LIBS) $(GTK_LIBS) $(PYTHON_LIBS) $(L_BOOST_PYTHON)
# not needed: linked by dependency libs
# $(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS)
dynarama-bin.patch
dynarama-main.patch
lidia.patch
coot-make-shelx-restraints.patch
compare-dictionaries.patch