summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>2008-05-11 18:26:00 +0000
committermichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>2008-05-11 18:26:00 +0000
commitd77f50857ce4192fb9ab748b83f3d3d59699f5f1 (patch)
treeed5f42b83ed477f6deab1710154ee8004ef5cec4
parent593a87ce2254a7966d33fa88e2efa9cbbdb4f7f0 (diff)
Merged branch to fix libusrp dependence on CoreFoundation on OSX 10.4.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8395 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--usrp/host/lib/legacy/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am
index 9714dc3f64..d913b6bb12 100644
--- a/usrp/host/lib/legacy/Makefile.am
+++ b/usrp/host/lib/legacy/Makefile.am
@@ -24,7 +24,7 @@ common_INCLUDES = $(USRP_INCLUDES)
lib_LTLIBRARIES = libusrp.la
-libusrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
libusrp_la_common_LIBADD = \
$(USB_LIBS) \
@@ -34,9 +34,11 @@ libusrp_la_common_LIBADD = \
if FUSB_TECH_darwin
AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
+libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
else
AM_CPPFLAGS = $(common_INCLUDES) $(WITH_INCLUDES)
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
+libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
endif
EXTRA_DIST = \