From 6702bd5b6470dcae091b0d0c5aa426537f2cbc1e Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sun, 21 Nov 2010 18:07:12 -0700
Subject: always go into the swig directory

---
 gnuradio-core/src/lib/Makefile.am | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'gnuradio-core/src/lib/Makefile.am')

diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index f3a3accdb..1281b4aa6 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -24,10 +24,7 @@ include $(top_srcdir)/Makefile.common
 ## Process this file with automake to produce Makefile.in
 
 # We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier .
-if PYTHON
-SUBDIRS += swig
-endif
+SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
-- 
cgit 


From 606681bd0ab4abf43e0c3eab3c847a198269ca88 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 23 Jan 2011 15:21:11 -0500
Subject: Needed to specify the use of boost::filesystem library.

---
 gnuradio-core/src/lib/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gnuradio-core/src/lib/Makefile.am')

diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 1281b4aa6..4db2ff167 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -66,4 +66,7 @@ libgnuradio_core_qa_la_LIBADD  = 	\
 
 bin_PROGRAMS = gnuradio-config-info
 gnuradio_config_info_SOURCES = gnuradio-config-info.cc
-gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)
+gnuradio_config_info_LDADD = libgnuradio-core.la \
+	$(BOOST_LDFLAGS) \
+	$(BOOST_PROGRAM_OPTIONS_LIB) \
+	$(BOOST_FILESYSTEM_LIB)
-- 
cgit