Changeset 7301

Show
Ignore:
Timestamp:
12/27/07 14:56:12
Author:
jcorgan
Message:

Applied changeset r7252 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/usrp/host/lib/legacy/Makefile.am

    r6149 r7301  
    2121include $(top_srcdir)/Makefile.common 
    2222 
    23 INCLUDES = $(USRP_INCLUDES) $(OMNITHREAD_INCLUDES) 
     23common_INCLUDES = $(USRP_INCLUDES) 
    2424 
    2525lib_LTLIBRARIES = libusrp.la 
    …… 
    2727libusrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 
    2828 
    29 libusrp_la_LIBADD =                   \ 
     29libusrp_la_common_LIBADD =            \ 
    3030        $(USB_LIBS)                     \ 
    31         ../../misc/libmisc.la            
     31        ../../misc/libmisc.la 
     32 
     33# darwin fusb requires omnithreads 
     34if FUSB_TECH_darwin 
     35INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) 
     36libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA) 
     37else 
     38INCLUDES = $(common_INCLUDES) 
     39libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) 
     40endif 
    3241 
    3342EXTRA_DIST =                            \ 
    3443        std_paths.h.in                  \ 
    3544        usrp_dbid.dat                    
    36  
    3745 
    3846BUILT_SOURCES =                         \