From cbb8e474bb5592753a340ba31d3afbab7226f7c6 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 12 Jan 2010 14:43:43 -0800
Subject: Reorganized structure into include, lib, test, firmware, fpga. The
 fpga and firmware are empty placeholders for now.

---
 Makefile.common | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'Makefile.common')

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)
-- 
cgit v1.2.3