[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4636 - in gnuradio/branches/developers/jcorgan/linkin
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r4636 - in gnuradio/branches/developers/jcorgan/linking: . gnuradio-core/src/lib gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-ezdop/src/lib gr-gsm-fr-vocoder/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src mblock/src/lib pmt/src/lib |
|
Date: |
Sun, 25 Feb 2007 18:05:26 -0700 (MST) |
Author: jcorgan
Date: 2007-02-25 18:05:26 -0700 (Sun, 25 Feb 2007)
New Revision: 4636
Modified:
gnuradio/branches/developers/jcorgan/linking/Makefile.common
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/tests/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gnuradio-examples/c++/dial_tone/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-osx/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-comedi/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-ezdop/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-pager/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-usrp/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/gr-video-sdl/src/Makefile.am
gnuradio/branches/developers/jcorgan/linking/mblock/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/linking/pmt/src/lib/Makefile.am
Log:
Revamp of the linking phase of the build.
All dependencies within the tree are stored in _LA macros.
All dependencies outside the tree are stored in _LIBS macros.
This should fix the recent linking breakage, but will likely
cause regressions on Win32. This reverses some of what was done
to fix ticket:138.
Modified: gnuradio/branches/developers/jcorgan/linking/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/Makefile.common
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/Makefile.common
2007-02-26 01:05:26 UTC (rev 4636)
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -54,31 +54,24 @@
-I$(top_builddir)/gnuradio-core/src/lib/swig \
$(FFTW3F_CFLAGS)
-# How to link in the top-level omnithreads library
+# How to link in the top-level omnithreads library from inside the tree
OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
-OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
+OMNITHREAD_LA = $(top_builddir)/omnithread/libgromnithread.la
-# 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
+# How to link in GNU Radio core library from inside the tree
+GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
# This is a dependency for many swig operations
GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
-# The below used to be set in PKGCONFIG but now point to the current
-# build tree.
+# How to link in the USRP library from inside the tree
USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
-I$(top_srcdir)/usrp/firmware/include
+USRP_LA = -L$(top_builddir)/usrp/host/lib -lusrp
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib -lusrp
-
+# How to link the PMT library from inside the tree
PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
-PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
Modified:
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -36,7 +36,6 @@
libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
$(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
libgnuradio_core_la_LIBADD = \
filter/libfilter.la \
g72x/libccitt.la \
@@ -46,7 +45,7 @@
missing/libmissing.la \
reed-solomon/librs.la \
runtime/libruntime.la \
- $(OMNITHREAD_LIBS) \
+ $(OMNITHREAD_LA) \
$(FFTW3F_LIBS)
libgnuradio_core_qa_la_LIBADD = \
Modified:
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/swig/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/lib/swig/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -118,8 +118,7 @@
_gnuradio_swig_py_runtime_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
@@ -150,8 +149,7 @@
_gnuradio_swig_py_general_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
@@ -182,8 +180,7 @@
_gnuradio_swig_py_gengen_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
@@ -214,8 +211,7 @@
_gnuradio_swig_py_filter_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
@@ -246,8 +242,7 @@
_gnuradio_swig_py_io_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/tests/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/tests/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gnuradio-core/src/tests/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -33,7 +33,7 @@
#Test program to test setting up buffers using gr_test which can be run
manually
EXTRA_DIST = \
test_buffers.py
-
+
noinst_PROGRAMS = \
benchmark_dotprod \
benchmark_dotprod_fsf \
@@ -50,7 +50,7 @@
test_vmcircbuf
-LIBGNURADIO = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+LIBGNURADIO = $(GNURADIO_CORE_LA)
LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la
$(LIBGNURADIO)
benchmark_dotprod_SOURCES = benchmark_dotprod.cc
Modified:
gnuradio/branches/developers/jcorgan/linking/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gnuradio-examples/c++/dial_tone/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gnuradio-examples/c++/dial_tone/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -25,12 +25,9 @@
INCLUDES=$(STD_DEFINES_AND_INCLUDES) \
-I$(top_srcdir)/gr-audio-alsa/src
-GR_AUDIO_ALSA_LIBS=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
+GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la
-# For compiling outside the tree, these are the usual
-# INCLUDES = -I/usr/local/include -I/usr/local/include/gnuradio
-# GNURADIO_CORE_LIBS = -lgnuradio-core
-# GR_AUDIO_ALSA_LIBS = -lgr_audio_alsa
+# For compiling outside the tree, these will get fished out by pkgconfig
noinst_PROGRAMS = dial_tone
@@ -42,7 +39,7 @@
main.cc
dial_tone_LDADD = \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(GR_AUDIO_ALSA_LIBS)
MOSTLYCLEANFILES = *~
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-atsc/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-atsc/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -30,8 +30,6 @@
INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(CPPUNIT_INCLUDES)
-#LIBS += $(GNURADIO_CORE_LIBS)
-
EXTRA_DIST = \
gen_encoder.py \
qa_atsci_trellis_encoder_t1_input.dat \
@@ -204,9 +202,12 @@
test_atsci_SOURCES = test_atsci.cc
-test_atsci_LDADD = libatsc-qa.la libatsc.la $(GNURADIO_CORE_LIBS)
$(CPPUNIT_LIBS)
+test_atsci_LDADD = \
+ libatsc-qa.la \
+ libatsc.la \
+ $(GNURADIO_CORE_LA) \
+ $(CPPUNIT_LIBS)
-
# ------------------------------------------------------------------------
# This is the swig-ish part of the Makefile.
# It builds the atsc module which we'll load into python
@@ -249,7 +250,7 @@
# link the library against some comon swig runtime code and the
# c++ standard library
_atsc_la_LIBADD = \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
libatsc.la \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-audio-alsa/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-audio-alsa/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -78,7 +78,7 @@
_audio_alsa_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(ALSA_LIBS) \
libgr_audio_alsa.la \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-audio-jack/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-audio-jack/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -76,7 +76,7 @@
_audio_jack_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(JACK_LIBS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-audio-oss/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-audio-oss/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -69,7 +69,7 @@
_audio_oss_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(OSS_LIBS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-audio-osx/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-audio-osx/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -73,7 +73,7 @@
_audio_osx_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
_audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework
AudioUnit -framework CoreAudio -framework AudioToolbox
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-portaudio/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gr-audio-portaudio/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gr-audio-portaudio/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -75,7 +75,7 @@
_audio_portaudio_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(PORTAUDIO_LIBS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-audio-windows/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gr-audio-windows/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gr-audio-windows/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -69,7 +69,7 @@
_audio_windows_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(WINAUDIO_LIBS) \
-lstdc++
Modified: gnuradio/branches/developers/jcorgan/linking/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-comedi/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-comedi/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -75,7 +75,7 @@
_comedi_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(COMEDI_LIBS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-ezdop/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-ezdop/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-ezdop/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -32,7 +32,7 @@
-I$(top_srcdir)/ezdop/src/firmware \
-I$(top_srcdir)/ezdop/src/host/ezdop
-EZDOP_LIBS = -L$(top_builddir)/ezdop/src/host/ezdop/ -lezdop
+EZDOP_LA = $(top_builddir)/ezdop/src/host/ezdop/libezdop.la
INCLUDES = \
$(STD_DEFINES_AND_INCLUDES) \
@@ -78,8 +78,8 @@
# c++ standard library
_ezdop_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
- $(EZDOP_LIBS) \
+ $(GNURADIO_CORE_LA) \
+ $(EZDOP_LA) \
-lstdc++
ezdop.cc ezdop.py: $(ALL_IFILES)
@@ -89,7 +89,6 @@
grinclude_HEADERS = \
ezdop_source_c.h
-
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
$(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gr-gsm-fr-vocoder/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gr-gsm-fr-vocoder/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -76,7 +76,7 @@
_gsm_full_rate_la_LIBADD = \
gsm/libgsm.la \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
Modified: gnuradio/branches/developers/jcorgan/linking/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-pager/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-pager/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -93,7 +93,7 @@
# link the library against the c++ standard library
_pager_swig_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
pager_swig.cc pager_swig.py: $(ALL_IFILES)
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-qtgui/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-qtgui/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -51,9 +51,14 @@
qt_examples.cc \
$(qt_examples_MOC)
-qt_examples_LDADD = $(QWT_LIBS) $(QT_LIBS)
-qt_examples_LDFLAGS = $(QT_CFLAGS) $(QWT_CFLAGS) $(GNURADIO_CORE_LIBS)
+qt_examples_LDADD = $(QWT_LIBS) \
+ $(QT_LIBS) \
+ $(GNURADIO_CORE_LA)
+
+qt_examples_LDFLAGS = $(QT_CFLAGS) \
+ $(QWT_CFLAGS)
+
MOSTLYCLEANFILES = \
*~
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/linking/gr-radio-astronomy/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++
gnuradio/branches/developers/jcorgan/linking/gr-radio-astronomy/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -65,9 +65,9 @@
# link the library against some comon swig runtime code and the
# c++ standard library
-_ra_la_LIBADD = \
- $(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+_ra_la_LIBADD = \
+ $(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
ra.cc ra.py: $(ALL_IFILES)
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-trellis/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-trellis/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -110,7 +110,7 @@
# c++ standard library
_trellis_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
Modified: gnuradio/branches/developers/jcorgan/linking/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-usrp/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-usrp/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -94,8 +94,8 @@
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
- $(USRP_LIBS) \
+ $(GNURADIO_CORE_LA) \
+ $(USRP_LA) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/gr-video-sdl/src/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/gr-video-sdl/src/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -69,7 +69,7 @@
_video_sdl_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(SDL_LIBS) \
-lstdc++
Modified:
gnuradio/branches/developers/jcorgan/linking/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/mblock/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/mblock/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -53,7 +53,7 @@
# link the library against the c++ standard library
libmblock_la_LIBADD = \
- $(PMT_LIBS) \
+ $(PMT_LA) \
-lstdc++
include_HEADERS = \
Modified: gnuradio/branches/developers/jcorgan/linking/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/linking/pmt/src/lib/Makefile.am
2007-02-26 00:41:10 UTC (rev 4635)
+++ gnuradio/branches/developers/jcorgan/linking/pmt/src/lib/Makefile.am
2007-02-26 01:05:26 UTC (rev 4636)
@@ -89,12 +89,8 @@
# magic flags
libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
-# link the library against the c++ standard library
-# Note: Win32 libtool doesn't pull dependencies from the .la file
-# correctly, so we must add $(PMT_LIBS) below
libpmt_qa_la_LIBADD = \
libpmt.la \
- $(PMT_LIBS) \
$(CPPUNIT_LIBS) \
-lstdc++
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4636 - in gnuradio/branches/developers/jcorgan/linking: . gnuradio-core/src/lib gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-ezdop/src/lib gr-gsm-fr-vocoder/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src mblock/src/lib pmt/src/lib,
jcorgan <=