diff options
| author | jcorgan | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /gr-qtgui/src/lib/Makefile.am | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
| download | gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2 gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip | |
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-qtgui/src/lib/Makefile.am')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 913b2bd81..b3912100a 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -31,9 +31,6 @@ ourlibdir = $(grpyexecdir)/qtgui AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(QT_INCLUDES) -I. $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) - ALL_IFILES = \ $(LOCAL_IFILES) \ $(NON_LOCAL_IFILES) @@ -42,7 +39,7 @@ NON_LOCAL_IFILES = \ $(GNURADIO_I) LOCAL_IFILES = \ - $(top_srcdir)/gr-qtgui/src/lib/qtgui.i + $(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 @@ -143,8 +140,9 @@ libqtgui_la_LIBADD = \ -lstdc++ \ $(QT_LIBS) -qtgui.cc qtgui.py: qtgui.i $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module qtgui -o qtgui.cc $(LOCAL_IFILES) +qtgui.cc qtgui.py: $(ALL_IFILES) + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module qtgui \ + -o qtgui.cc $(LOCAL_IFILES) # These swig headers get installed in ${prefix}/include/gnuradio/swig swiginclude_HEADERS = \ |