Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG...

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

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 034eff0533036122efe7354cd45597ea9d9d8cbe..eee58990d890955cb1820e3c8a6cd1869ccc170e 100644 (file)
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -21,30 +21,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.qtgui module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui
-
-ourpythondir = $(grpythondir)/qtgui
-ourlibdir    = $(grpyexecdir)/qtgui
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
               $(QT_INCLUDES) -I. $(WITH_INCLUDES)
 
-ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 \
-       $(NON_LOCAL_IFILES)             
-
-NON_LOCAL_IFILES =                     \
-       $(GNURADIO_I)
-
-LOCAL_IFILES =                                 \
-       $(srcdir)/qtgui.i
-
-# These files are built by SWIG.  The first is the C++ glue.
-# The second is the python wrapper that loads the shared library
-# and knows how to call our extensions.
-
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
 if BUILD_QT
@@ -60,18 +39,6 @@ endif
 
 EXTRA_DIST = spectrumdisplayform.ui
 
-BUILT_SOURCES =                                \
-       qtgui.cc                                \
-       qtgui.py                                \
-       $(QMAKE_SOURCES)
-
-# This gets qtgui.py installed in the right place
-ourpython_PYTHON =                     \
-       qtgui.py
-
-# Build the library for Python module to link against
-ourlib_LTLIBRARIES = _qtgui.la
-
 # Build the normal library for C++ apps to link against
 lib_LTLIBRARIES = libqtgui.la
 
@@ -91,10 +58,6 @@ libqtgui_la_SOURCES =        \
        qtgui_sink_c.cc                         \
        qtgui_sink_f.cc
 
-_qtgui_la_SOURCES =                    \
-       $(libqtgui_la_SOURCES)          \
-       qtgui.cc
-
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        FrequencyDisplayPlot.h          \
@@ -127,34 +90,36 @@ else
 endif
 
 # magic flags
-_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
-# link the library against the c++ standard library
-_qtgui_la_LIBADD =             \
-       $(PYTHON_LDFLAGS)       \
+libqtgui_la_LIBADD =           \
        $(GNURADIO_CORE_LA)     \
        -lstdc++                \
        $(QT_LIBS)
 
+##############################
+# SWIG interface and library
 
-libqtgui_la_LIBADD =           \
-       $(GNURADIO_CORE_LA)     \
-       -lstdc++                \
-       $(QT_LIBS)
+TOP_SWIG_IFILES =              \
+       qtgui.i
 
-qtgui.cc qtgui.py: $(ALL_IFILES)
-       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module qtgui \
-               -o qtgui.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+#   import gnuradio.qtgui
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+qtgui_pythondir_category =     \
+       gnuradio
 
-# These swig headers get installed in ${prefix}/include/gnuradio/swig
-swiginclude_HEADERS =                  \
-       $(LOCAL_IFILES)
+# additional libraries for linking with the SWIG-generated library
+qtgui_la_swig_libadd =         \
+       libqtgui.la
 
+include $(top_srcdir)/Makefile.swig
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES =                \
+       $(QMAKE_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)