Fixes inclusion of omnithreads library and includes in usrp for
authormichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>
Mon, 24 Dec 2007 02:28:31 +0000 (02:28 +0000)
committermichaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5>
Mon, 24 Dec 2007 02:28:31 +0000 (02:28 +0000)
darwin/OSX only.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7252 221aa14e-8319-0410-a670-987f0aec2ac5

usrp/host/lib/legacy/Makefile.am

index 3dd10bf1cdc5846da33d36d1ff8470ab4e930942..3d1e5a6bcbdd6d9e76456736097aa7dd113ba254 100644 (file)
 
 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                    \