diff options
| author | Don Ward | 2010-04-30 17:00:33 -0400 |
|---|---|---|
| committer | Don Ward | 2010-04-30 17:00:33 -0400 |
| commit | dda6ed353551d3493983bd56e0ca8ee8ed4407c5 (patch) | |
| tree | ad6e304c1843953ca88dd944bda4498b5fe62570 /usrp/host/lib/Makefile.am | |
| parent | 04d3f1954b589656b34298b98e36b8667700d89a (diff) | |
| parent | 9038b3530d0ec746f401f3c443e2f862fff5a18e (diff) | |
| download | gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.gz gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.bz2 gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.zip | |
Merge branch 'master' into udp
Diffstat (limited to 'usrp/host/lib/Makefile.am')
| -rw-r--r-- | usrp/host/lib/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index e80f27112..5848412c9 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -1,7 +1,7 @@ # # USRP - Universal Software Radio Peripheral # -# Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,10 +31,10 @@ libusrp_la_common_LIBADD = \ $(BOOST_THREAD_LIB) \ ../misc/libmisc.la -# darwin fusb requires omnithreads +# darwin fusb requires gruel (for threading) if FUSB_TECH_darwin -AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) -libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA) +AM_CPPFLAGS = $(common_INCLUDES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) +libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA) libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation else AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) @@ -70,7 +70,6 @@ darwin_CODE = \ circular_buffer.h \ circular_linked_list.h \ darwin_libusb.h \ - mld_threads.h \ usrp_prims_libusb0.cc |