[Commit-gnuradio] r6645 - gnuradio/branches/releases/3.1

[jcorgan]

Author: jcorgan
Date: 2007-10-17 08:57:52 -0600 (Wed, 17 Oct 2007)
New Revision: 6645

Modified:
   gnuradio/branches/releases/3.1/Makefile.common
Log:
Added workaround for broken libtool on Win32.  This was not done for the trunk.

Modified: gnuradio/branches/releases/3.1/Makefile.common
===================================================================
--- gnuradio/branches/releases/3.1/Makefile.common      2007-10-17 05:08:09 UTC 
(rev 6644)
+++ gnuradio/branches/releases/3.1/Makefile.common      2007-10-17 14:57:52 UTC 
(rev 6645)
@@ -67,7 +67,11 @@
 OMNITHREAD_LA = $(top_builddir)/omnithread/libgromnithread.la
 
 # How to link in GNU Radio core library from inside the tree
-GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+# NOTE: The below line is a workaround for a broken libtool implementation
+#  for Win32.  Normally, the addition of OMNITHREAD_LA would not be necessary,
+#  as this information is already in the core .la file.
+GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+                  $(OMNITHREAD_LA)
 
 # This is a dependency for many swig operations
 GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i