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-gcell/src | |
| 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-gcell/src')
| -rw-r--r-- | gr-gcell/src/Makefile.am | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am index 36b618f4b..4ed607c55 100644 --- a/gr-gcell/src/Makefile.am +++ b/gr-gcell/src/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 # @@ -32,10 +32,11 @@ TESTS = run_tests ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \ + $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \ - $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) +# Special swig arguments +LOCAL_SWIG_DEFINES_AND_INCLUDES = $(GCELL_INCLUDES) # ---------------------------------------------------------------- # The C++ blocks @@ -98,8 +99,9 @@ _gcell_la_CXXFLAGS = @swig_CXXFLAGS@ swiginclude_HEADERS = \ $(LOCAL_IFILES) -#gcell.cc gcell.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES) -# $(SWIG) $(SWIGPYTHONARGS) -module gcell -o gcell.cc $(LOCAL_IFILES) +#gcell.cc gcell.py: $(ALL_IFILES) +# $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gcell \ +# -o gcell.cc $(LOCAL_IFILES) # KLUDGE: Force runtime include of gcell.d dependency file. # This is not guaranteed to be portable, but will probably work. @@ -108,8 +110,9 @@ swiginclude_HEADERS = \ gcell.py gcell.h: gcell.cc -gcell.cc : gcell.i $(GNURADIO_I) - if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gcell.Td -module gcell -o gcell.cc $(srcdir)/gcell.i ;\ +gcell.cc : $(srcdir)/gcell.i $(GNURADIO_I) + if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gcell.Td -module gcell \ + -o gcell.cc $(srcdir)/gcell.i ;\ then if test $(host_os) = mingw32; \ then sed 's,\\\\,/,g' <gcell.Td >gcell.d; rm -f gcell.Td; \ else mv -f gcell.Td gcell.d; fi \ |