diff options
| author | michaelld | 2007-12-24 02:28:31 +0000 |
|---|---|---|
| committer | michaelld | 2007-12-24 02:28:31 +0000 |
| commit | f3b12bf198e7a6a2d23bd67cda3653137a8f2c02 (patch) | |
| tree | ea869fd530845eac88aee3470d0ce9cf8bc5c889 /usrp | |
| parent | 03f6a23182bee8d7502a69ec3b2000f6fb83b168 (diff) | |
| download | gnuradio-f3b12bf198e7a6a2d23bd67cda3653137a8f2c02.tar.gz gnuradio-f3b12bf198e7a6a2d23bd67cda3653137a8f2c02.tar.bz2 gnuradio-f3b12bf198e7a6a2d23bd67cda3653137a8f2c02.zip | |
Fixes inclusion of omnithreads library and includes in usrp for
darwin/OSX only.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7252 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp')
| -rw-r--r-- | usrp/host/lib/legacy/Makefile.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index 3dd10bf1c..3d1e5a6bc 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -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 \ |