diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-12 14:43:43 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-12 14:43:43 -0800 |
| commit | cbb8e474bb5592753a340ba31d3afbab7226f7c6 (patch) | |
| tree | 6dd14d37d8d46f3a506a309f57d82ed1ed05f781 /Makefile.common | |
| parent | 4e94574aeaa46c671bba0a6fc83cb967d228c880 (diff) | |
| download | uhd-cbb8e474bb5592753a340ba31d3afbab7226f7c6.tar.gz uhd-cbb8e474bb5592753a340ba31d3afbab7226f7c6.tar.bz2 uhd-cbb8e474bb5592753a340ba31d3afbab7226f7c6.zip | |
Reorganized structure into include, lib, test, firmware, fpga.
The fpga and firmware are empty placeholders for now.
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/Makefile.common b/Makefile.common index b7e672baf..3b1464439 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2,20 +2,12 @@ # Copyright 2010 Ettus Research LLC # -######################################################################## -## Makefile variables for the top level component: the uhd -######################################################################## -USRP_UHD_INCLUDES = \ - -I$(top_srcdir)/usrp_uhd/include +USRP_UHD_LA = $(top_srcdir)/lib/libusrp_uhd.la -USRP_UHD_LA = \ - $(top_srcdir)/usrp_uhd/lib/libusrp_uhd.la - -######################################################################## -## Makefile variables for the usrp dboard component -######################################################################## -USRP_DBOARD_INCLUDES = \ - -I$(top_srcdir)/usrp_dboard/include +GENERAL_CPPFLAGS = \ + -I$(top_srcdir)/include \ + $(BOOST_CPPFLAGS) -USRP_DBOARD_LA = \ - $(top_srcdir)/usrp_dboard/lib/libusrp_dboard.la +GENERAL_LDDFLAGS = \ + $(BOOST_LDFLAGS) \ + $(BOOST_THREAD_LIB) |