Finally, the simple fix for the qtgui issues; also, changed the naming scheme output...

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

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 12bdf08c547e8df0048a62be42e3e6258f6c573d..8e0dfe1e386dd9b0597dfa8fee824e4abd4f29ce 100644 (file)
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,77 +21,59 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.audio_jack module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
 EXTRA_DIST = run_tests.in
 
-TESTS = run_tests
-
-LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-audio-jack/src/audio_jack.i                            
-
-NON_LOCAL_IFILES =                     \
-       $(GNURADIO_I)
-
-ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 \
-       $(NON_LOCAL_IFILES)             
-
-BUILT_SOURCES =                        \
-       audio_jack.cc                   \
-       audio_jack.py                           
-
-ourpython_PYTHON =                     \
-       audio_jack.py
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
-
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS =                    \
+       audio_jack_sink.h               \
+       audio_jack_source.h
 
-ourlib_LTLIBRARIES = _audio_jack.la
+noinst_HEADERS =                       \
+       gri_jack.h
 
+lib_LTLIBRARIES = libgnuradio-audio-jack.la
 
-_audio_jack_la_SOURCES =               \
-       audio_jack.cc                   \
+libgnuradio_audio_jack_la_SOURCES =    \
        audio_jack_sink.cc              \
        audio_jack_source.cc            \
-       gri_jack.cc                     
+       gri_jack.cc
 
-grinclude_HEADERS =                    \
-       audio_jack_sink.h               \
-       audio_jack_source.h             
+libgnuradio_audio_jack_la_LIBADD =     \
+       $(GNURADIO_CORE_LA)             \
+       $(JACK_LIBS)
 
-noinst_HEADERS =                       \
-       gri_jack.h                      
+libgnuradio_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
+noinst_PYTHON =                        \
+       qa_jack.py
 
-swiginclude_HEADERS =                  \
-       $(LOCAL_IFILES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-_audio_jack_la_LIBADD =                \
-       $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LA)             \
-       $(JACK_LIBS)                    \
-       -lstdc++                                
+if PYTHON
+###################################
+# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
-_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+TOP_SWIG_IFILES =                      \
+       audio_jack.i
 
-audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+#   import gnuradio.audio_jack
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+audio_jack_pythondir_category =                \
+       gnuradio
 
-noinst_PYTHON =                        \
-       qa_jack.py                      
+# additional libraries for linking with the SWIG-generated library
+audio_jack_la_swig_libadd =            \
+       libgnuradio-audio-jack.la
+
+include $(top_srcdir)/Makefile.swig
 
-MOSTLYCLEANFILES = \
-       $(BUILT_SOURCES) *~ *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
-# 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
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)
+endif