Reverted changeset r8180, r8181, and r8184 on trunk.

[debian/gnuradio] / gr-audio-portaudio / src / Makefile.am

diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index cf024c263111d1ebeb4cb2e872cd7bd4a6d38827..fc00b7e26614f3c77e0df319efe32b29280f6699 100644 (file)
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -15,14 +15,12 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
 include $(top_srcdir)/Makefile.common
 
-LIBS += $(GNURADIO_CORE_LIBS)
-
 # Install this stuff so that it ends up as the gnuradio.audio_portaudio module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -35,29 +33,30 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_portaudio.i                               
+       $(top_srcdir)/gr-audio-portaudio/src/audio_portaudio.i
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
        $(NON_LOCAL_IFILES)             
 
 BUILT_SOURCES =                        \
-       audio_portaudio.cc                      \
+       audio_portaudio.cc              \
        audio_portaudio.py                              
 
 ourpython_PYTHON =                     \
        audio_portaudio.py
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+       $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+       -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 
 ourlib_LTLIBRARIES = _audio_portaudio.la
 
-
 _audio_portaudio_la_SOURCES =          \
        audio_portaudio.cc              \
        audio_portaudio_sink.cc         \
@@ -69,25 +68,29 @@ grinclude_HEADERS =                 \
        audio_portaudio_source.h                
 
 noinst_HEADERS =                       \
-       gri_portaudio.h                 
-
+       gri_portaudio.h
 
 swiginclude_HEADERS =                  \
        $(LOCAL_IFILES)
 
 _audio_portaudio_la_LIBADD =           \
        $(PYTHON_LDFLAGS)               \
+       $(GNURADIO_CORE_LA)             \
        $(PORTAUDIO_LIBS)               \
-       -lstdc++                                
+       -lstdc++
 
 _audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h audio_portaudio_source.h
-       $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $<
-
+       $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $(LOCAL_IFILES)
 
 noinst_PYTHON =                        \
-       qa_portaudio.py                 
+       qa_portaudio.py
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc
+
+# Don't distribute output of swig
+dist-hook:
+       @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
+       @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done