[Commit-gnuradio] r7251 - gnuradio/branches/developers/michaelld/usrp_omnithread_la_fix/usrp/host/lib/legacy

[michaelld]

Author: michaelld
Date: 2007-12-23 19:08:02 -0700 (Sun, 23 Dec 2007)
New Revision: 7251

Modified:
   
gnuradio/branches/developers/michaelld/usrp_omnithread_la_fix/usrp/host/lib/legacy/Makefile.am
Log:
Implemented fix; non-darwin/OSX OSs now will not include omnithreads
headers in the compile include path (they don't need it anyway).



Modified: 
gnuradio/branches/developers/michaelld/usrp_omnithread_la_fix/usrp/host/lib/legacy/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/usrp_omnithread_la_fix/usrp/host/lib/legacy/Makefile.am
      2007-12-24 01:44:01 UTC (rev 7250)
+++ 
gnuradio/branches/developers/michaelld/usrp_omnithread_la_fix/usrp/host/lib/legacy/Makefile.am
      2007-12-24 02:08:02 UTC (rev 7251)
@@ -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                    \