[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4506 - gnuradio/branches/developers/n4hy/ofdm2/omnith
From: |
n4hy |
Subject: |
[Commit-gnuradio] r4506 - gnuradio/branches/developers/n4hy/ofdm2/omnithread |
Date: |
Mon, 19 Feb 2007 12:33:08 -0700 (MST) |
Author: n4hy
Date: 2007-02-19 12:33:08 -0700 (Mon, 19 Feb 2007)
New Revision: 4506
Modified:
gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.in
Log:
bringing up to date
Modified: gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.am
2007-02-19 18:54:43 UTC (rev 4505)
+++ gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.am
2007-02-19 19:33:08 UTC (rev 4506)
@@ -44,6 +44,8 @@
nt.cc
endif
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+
libgromnithread_la_LIBADD = \
$(PTHREAD_LIBS)
Modified: gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.in
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.in
2007-02-19 18:54:43 UTC (rev 4505)
+++ gnuradio/branches/developers/n4hy/ofdm2/omnithread/Makefile.in
2007-02-19 19:33:08 UTC (rev 4506)
@@ -424,13 +424,20 @@
$(FFTW3F_CFLAGS)
-# These used to be set in PKGCONFIG but now point to the current
-# build tree.
-# FIXME shouldn't -lfftw3f -lm just be extracted from libgnuradio-core.la ???
-GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
- -lgnuradio-core -lfftw3f -lm
+# How to link in the top-level omnithreads library
+OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
+OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
+# How to link in GNU Radio core library
+# Note: Win32 libtool cannot extract DLL dependencies already stored in
+# libgnuradio-core, so the core's dependencies must be repeated here
+# This is redundant but harmless on non-Win32 platforms
+GNURADIO_CORE_LIBS = $(OMNITHREAD_LIBS) \
+ $(FFTW3F_LIBS) \
+ -L$(top_builddir)/gnuradio-core/src/lib \
+ -lgnuradio-core
+
# This is a dependency for many swig operations
GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
@@ -442,8 +449,6 @@
USRP_LIBS = -L$(top_builddir)/usrp/host/lib -lusrp
PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
-OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
-OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
@@ -470,6 +475,7 @@
@address@hidden = \
@OMNITHREAD_POSIX_TRUE@ posix.cc
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
libgromnithread_la_LIBADD = \
$(PTHREAD_LIBS)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4506 - gnuradio/branches/developers/n4hy/ofdm2/omnithread,
n4hy <=