summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-06 17:38:29 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-06 17:38:29 +0000
commit5a113d870a2989efc1da70910d1cc1fee9f497da (patch)
tree55fc626709864f1069395d637f3593bed7fefe5d /Makefile.common
parent79efa0fdae858321fbb86f9e11f7cc7cd7c6c5f1 (diff)
Additional comments in Makefile.common (further testing commit emails.)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3188 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common
index 1844ab175d..78853094c1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -47,6 +47,8 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
-I$(top_builddir)/gnuradio-core/src/lib/swig \
$(FFTW3F_CFLAGS)
+# These used to be set in PKGCONFIG but now point to the current
+# build tree.
GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
-lgnuradio-core -lfftw3f -lm
@@ -60,4 +62,6 @@ USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
-lusrp
+# This used to be set in configure.ac but is now defined here for all
+# Makefiles when this fragment is included.
STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)