[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10308 - in gnuradio/branches/developers/michaelld/swi
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r10308 - in gnuradio/branches/developers/michaelld/swigpythonargs: gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src |
|
Date: |
Tue, 27 Jan 2009 06:31:15 -0700 (MST) |
Author: michaelld
Date: 2009-01-27 06:31:11 -0700 (Tue, 27 Jan 2009)
New Revision: 10308
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
Log:
Changed $(top_srcdir)/... references to $(srcdir). A little clean-up
of .i file Makefile.am commands.
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-atsc/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -222,7 +222,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-atsc/src/lib/atsc.i
+ $(srcdir)/atsc.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _atsc shared library
@@ -253,7 +253,7 @@
libatsc.la \
-lstdc++
-atsc.cc atsc.py: atsc.i $(ALL_IFILES)
+atsc.cc atsc.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module atsc \
-o atsc.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-alsa/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-alsa/src/audio_alsa.i
+ $(srcdir)/audio_alsa.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -89,7 +89,7 @@
_audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@
-audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+audio_alsa.cc audio_alsa.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_alsa \
-o audio_alsa.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-jack/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-jack/src/audio_jack.i
+ $(srcdir)/audio_jack.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -79,7 +79,7 @@
_audio_jack_la_CXXFLAGS = @swig_CXXFLAGS@
-audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+audio_jack.cc audio_jack.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_jack \
-o audio_jack.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-oss/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-oss/src/audio_oss.i
+ $(srcdir)/audio_oss.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -74,7 +74,7 @@
_audio_oss_la_CXXFLAGS = @swig_CXXFLAGS@
-audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+audio_oss.cc audio_oss.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_oss \
-o audio_oss.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-osx/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-osx/src/audio_osx.i
+ $(srcdir)/audio_osx.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-portaudio/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-portaudio/src/audio_portaudio.i
+ $(srcdir)/audio_portaudio.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-audio-windows/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-audio-windows/src/audio_windows.i
+ $(srcdir)/audio_windows.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -76,7 +76,7 @@
_audio_windows_la_CXXFLAGS = @swig_CXXFLAGS@
-audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
+audio_windows.cc audio_windows.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_windows \
-o audio_windows.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-comedi/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- $(top_srcdir)/gr-comedi/src/comedi.i
+ $(srcdir)/comedi.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -80,7 +80,7 @@
_comedi_la_CXXFLAGS = @swig_CXXFLAGS@
-comedi.cc comedi.py: $(LOCAL_IFILES)
+comedi.cc comedi.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module comedi \
-o comedi.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-cvsd-vocoder/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -38,7 +38,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
+ $(srcdir)/cvsd_vocoder.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
@@ -72,7 +72,7 @@
_cvsd_vocoder_la_CXXFLAGS = @swig_CXXFLAGS@
-cvsd_vocoder.cc cvsd_vocoder.py: cvsd_vocoder.i $(ALL_IFILES)
+cvsd_vocoder.cc cvsd_vocoder.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module cvsd_vocoder \
-o cvsd_vocoder.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gcell/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -36,8 +36,7 @@
$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# Special swig arguments
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
- $(GCELL_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(GCELL_INCLUDES)
# ----------------------------------------------------------------
# The C++ blocks
@@ -100,8 +99,9 @@
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.
@@ -110,8 +110,9 @@
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 \
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gpio/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -33,7 +33,7 @@
NON_LOCAL_IFILES = $(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-gpio/src/lib/gpio.i
+ $(srcdir)/gpio.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _gpio shared library
@@ -64,7 +64,7 @@
$(GNURADIO_CORE_LA) \
-lstdc++
-gpio_swig.cc gpio_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
+gpio_swig.cc gpio_swig.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gpio_swig \
-o gpio_swig.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -40,7 +40,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
+ $(srcdir)/gsm_full_rate.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
@@ -74,7 +74,7 @@
$(GNURADIO_CORE_LA) \
-lstdc++
-gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
+gsm_full_rate.cc gsm_full_rate.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gsm_full_rate \
-o gsm_full_rate.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-howto-write-a-block/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -41,7 +41,7 @@
LOCAL_IFILES = \
- $(top_srcdir)/src/lib/howto.i
+ $(srcdir)/howto.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
@@ -72,8 +72,9 @@
$(PYTHON_LDFLAGS) \
-lstdc++
-howto.cc howto.py: $(LOCAL_IFILES) $(ALL_IFILES)
- $(SWIG) $(SWIG_PYTHON_ARGS) -module howto -o howto.cc $(LOCAL_IFILES)
+howto.cc howto.py: $(ALL_IFILES)
+ $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module howto \
+ -o howto.cc $(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -42,11 +42,9 @@
NON_LOCAL_IFILES = \
$(GNURADIO_I)
-
LOCAL_IFILES = \
- $(top_srcdir)/gr-msdd6000/src/msdd.i
+ $(srcdir)/msdd.i
-
ALL_IFILES = \
$(LOCAL_IFILES) \
$(NON_LOCAL_IFILES)
@@ -86,7 +84,7 @@
-lstdc++
# -L/usr/lib/libfftw3f.so.3.1.2
-msdd.cc msdd.py: $(LOCAL_IFILES) $(ALL_IFILES)
+msdd.cc msdd.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module msdd \
-o msdd.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-pager/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -48,13 +48,13 @@
ALL_IFILES = \
$(LOCAL_IFILES) \
$(NON_LOCAL_IFILES) \
- pager_flex_frame.i
+ $(srcdir)/pager_flex_frame.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-pager/src/pager.i
+ $(srcdir)/pager.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-qtgui/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -39,7 +39,7 @@
$(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
@@ -140,7 +140,7 @@
-lstdc++ \
$(QT_LIBS)
-qtgui.cc qtgui.py: qtgui.i $(ALL_IFILES)
+qtgui.cc qtgui.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module qtgui \
-o qtgui.cc $(LOCAL_IFILES)
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-radio-astronomy/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -38,7 +38,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-radio-astronomy/src/lib/ra.i
+ $(srcdir)/ra.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-trellis/src/lib/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -104,7 +104,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- $(top_srcdir)/gr-trellis/src/lib/trellis.i
+ $(srcdir)/trellis.i
EXTRA_DIST = \
$(CODE_GENERATOR) \
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -110,13 +110,6 @@
# Special swig arguments
LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP_INCLUDES)
-#SWIG_PYTHON_ARGS = \
-# $(SWIG_PYTHON_FLAGS) \
-# $(STD_DEFINES_AND_INCLUDES) \
-# $(USRP_INCLUDES) \
-# $(WITH_INCLUDES) \
-# $(WITH_SWIG_INCLUDES)
-
usrp_swig.cc usrp_swig.py: $(ALL_IFILES)
$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp_swig \
-o usrp_swig.cc $(srcdir)/usrp.i
Modified:
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
2009-01-27 06:49:22 UTC (rev 10307)
+++
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp2/src/Makefile.am
2009-01-27 13:31:11 UTC (rev 10308)
@@ -89,16 +89,12 @@
ourpython_PYTHON = usrp2.py
# Special swig arguments
-SWIG_PYTHON_ARGS = \
- $(STD_DEFINES_AND_INCLUDES) \
- $(SWIGPYTHONFLAGS) \
- $(USRP2_INCLUDES) \
- $(WITH_INCLUDES) \
- $(WITH_SWIG_INCLUDES)
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP2_INCLUDES)
# Invoke SWIG wrapper generator
usrp2.cc usrp2.py: $(ALL_IFILES)
- $(SWIG) $(SWIG_PYTHON_ARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES)
+ $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp2 \
+ -o usrp2.cc $(LOCAL_IFILES)
# Create the Python shared library
ourlib_LTLIBRARIES = _usrp2.la
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10308 - in gnuradio/branches/developers/michaelld/swigpythonargs: gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src/lib gr-gsm-fr-vocoder/src/lib gr-howto-write-a-block/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-usrp2/src,
michaelld <=