From: michaelld Date: Sun, 11 May 2008 18:26:00 +0000 (+0000) Subject: Merged branch to fix libusrp dependence on CoreFoundation on OSX 10.4. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d77f50857ce4192fb9ab748b83f3d3d59699f5f1;p=debian%2Fgnuradio 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 --- diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index 9714dc3f..d913b6bb 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 = \