Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio...

[debian/gnuradio] / gr-cvsd-vocoder / src / lib / Makefile.am

diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index f4531afcbd53b95a37636c72311b3db8dbb30864..67126db77a058cab7fef9e01540a2e6168b8c8ca 100644 (file)
--- 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