From 42d9c6f495503d3d9d2db47a9979036c9233f976 Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Fri, 8 Feb 2008 23:32:10 +0000
Subject: Merged r7478:7608 from michaelld/t186 into trunk.  Adds ability to
 compile GNU Radio modules individually, using already installed dependent
 libraries and include files.  New functionality is enabled using --with-* on
 configure command line; existing build options should remain unchanged.  Nice
 work by Michael Dickens, still needs documentation update on wiki.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-cvsd-vocoder/src/lib/Makefile.am | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'gr-cvsd-vocoder')

diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index f4531afcb..67126db77 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ b/gr-cvsd-vocoder/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -28,10 +28,10 @@ include $(top_srcdir)/Makefile.common
 ourpythondir = $(grpythondir)/vocoder
 ourlibdir    = $(grpyexecdir)/vocoder
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
 ALL_IFILES = 				\
 	$(LOCAL_IFILES)			\
@@ -40,7 +40,6 @@ ALL_IFILES = 				\
 NON_LOCAL_IFILES =			\
 	$(GNURADIO_I)
 
-
 LOCAL_IFILES = 				\
 	$(top_srcdir)/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
 
-- 
cgit