[Commit-gnuradio] r7301 - gnuradio/branches/releases/3.1/usrp/host/lib/legacy

[jcorgan]

Author: jcorgan
Date: 2007-12-27 14:56:12 -0700 (Thu, 27 Dec 2007)
New Revision: 7301

Modified:
   gnuradio/branches/releases/3.1/usrp/host/lib/legacy/Makefile.am
Log:
Applied changeset r7252 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/usrp/host/lib/legacy/Makefile.am     
2007-12-27 21:51:06 UTC (rev 7300)
+++ gnuradio/branches/releases/3.1/usrp/host/lib/legacy/Makefile.am     
2007-12-27 21:56:12 UTC (rev 7301)
@@ -20,21 +20,29 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(USRP_INCLUDES) $(OMNITHREAD_INCLUDES)
+common_INCLUDES = $(USRP_INCLUDES)
 
 lib_LTLIBRARIES = libusrp.la
 
 libusrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
-libusrp_la_LIBADD =                    \
+libusrp_la_common_LIBADD =             \
        $(USB_LIBS)                     \
-       ../../misc/libmisc.la           
+       ../../misc/libmisc.la
 
+# darwin fusb requires omnithreads
+if FUSB_TECH_darwin
+INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES)
+libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
+else
+INCLUDES = $(common_INCLUDES)
+libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
+endif
+
 EXTRA_DIST =                           \
        std_paths.h.in                  \
        usrp_dbid.dat                   
 
-
 BUILT_SOURCES =                        \
        usrp_dbid.h                     \
        usrp_dbid.cc                    \