# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1250549868 14400
# Node ID 8f8cb45ad674f83daaef8a55e663c0a33920d3e5
# Parent  592a959b68e505eb44ae9101d95696dfbc2d8b80
src/Makefile.in: more linking tweaks

diff -r 592a959b68e5 -r 8f8cb45ad674 src/ChangeLog
--- a/src/ChangeLog	Mon Aug 17 17:24:21 2009 -0400
+++ b/src/ChangeLog	Mon Aug 17 18:57:48 2009 -0400
@@ -1,3 +1,10 @@
+2009-08-17  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (OCTINTERP_LINK_DEPS): Include FFTW_LDFLAGS,
+	FFTW_LIBS and READLINE_LIBS in the list.
+	(OCTAVE_LIBS): Attempt to include all necessary dependencies for
+	static linking.
+
 2009-08-17  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in (eigs.oct, chol.oct, qr.oct): Add library-specific
diff -r 592a959b68e5 -r 8f8cb45ad674 src/Makefile.in
--- a/src/Makefile.in	Mon Aug 17 17:24:21 2009 -0400
+++ b/src/Makefile.in	Mon Aug 17 18:57:48 2009 -0400
@@ -288,15 +288,37 @@
 ifeq ($(ENABLE_DYNAMIC_LINKING), true)
   OCTAVE_LIBS = $(LIBOCTINTERP)
 else
-  OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(QHULL_LIBS) \
-    $(GLPK_LIBS) $(MAGICK_LIBS) $(REGEX_LIBS) $(LIBCRUFT) \
-    $(LIBPLPLOT) $(LIBGLOB)
+  ## FIXME -- this list is probably not complete now.  It may not even
+  ## be possible to build a statically linked copy of Octave that is
+  ## fully functional.
+  OCTAVE_LIBS = -L. $(LIBOCTINTERP) \
+    -L../liboctave $(LIBOCTAVE) \
+    -L../libcruft $(LIBCRUFT) \
+    $(FFTW_LDFLAGS) $(FFTW_LIBS)
+    $(QHULL_LDFLAGS) $(QHULL_LIBS) \
+    $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \
+    $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \
+    $(SPARSE_LDFLAGS) $(SPARSE_LIBS) \
+    $(BLAS_LIBS) \
+    $(REGEX_LDFLAGS) $(REGEX_LIBS) \
+    $(CURL_LDFLAGS) $(CURL_LIBS) \
+    $(GLPK_LDFLAGS) $(GLPK_LIBS) \
+    $(MAGICK_LIBS) \
+    $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) \
+    $(FT2_LDFLAGS) $(FT2_LIBS) \
+    $(HDF5_LIBS) $(ZLIB_LIBS) \
+    $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \
+    $(READLINE_LIBS) $(TERM_LIBS) \
+    $(LIBPLPLOT) $(LIBGLOB) \
+    $(LIBS)
 endif
 
 OCTINTERP_LINK_DEPS = $(RLD_FLAG) -L../liboctave $(LIBOCTAVE) \
   -L../libcruft $(LIBCRUFT) \
+  $(FFTW_LDFLAGS) $(FFTW_LIBS) \
   $(HDF5_LIBS) $(ZLIB_LIBS) \
   $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \
+  $(READLINE_LIBS) \
   $(LIBS)
 
 OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) \