add python/*.cc to SOURCES so dependencies work properly.

14 files changed, 79 insertions, 212 deletions

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index bf9c6626a..a82c37913 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -84,7 +84,8 @@ libgnuradio_atsc_la_SOURCES = 			\
 	create_atsci_equalizer.cc		\
 	create_atsci_fs_checker.cc		\
 	create_atsci_fs_correlator.cc		\
-	plinfo.cc				
+	plinfo.cc				\
+	python/atsc.cc
 
 BUILT_SOURCES = 				\
 	atsci_viterbi_mux.cc
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index ed92cc197..fac75b89d 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -34,6 +34,11 @@ noinst_HEADERS = 			\
 noinst_PYTHON = 			\
 	qa_alsa.py
 
+if GUILE
+noinst_GUILE = 			\
+	qa_alsa.scm
+endif
+
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 ###################################
@@ -44,7 +49,8 @@ lib_LTLIBRARIES = libgnuradio-audio-alsa.la
 libgnuradio_audio_alsa_la_SOURCES = 	\
 	audio_alsa_sink.cc		\
 	audio_alsa_source.cc		\
-	gri_alsa.cc
+	gri_alsa.cc			\
+	python/audio_alsa.cc
 
 libgnuradio_audio_alsa_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
@@ -79,4 +85,5 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
-endif
\ No newline at end of file
+
+endif
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 8e0dfe1e3..f32ccc2a0 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -35,8 +35,9 @@ lib_LTLIBRARIES = libgnuradio-audio-jack.la
 
 libgnuradio_audio_jack_la_SOURCES = 	\
 	audio_jack_sink.cc		\
-	audio_jack_source.cc		\
-	gri_jack.cc
+	audio_jack_source.cc	\
+	gri_jack.cc				\
+	python/audio_jack.cc
 
 libgnuradio_audio_jack_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 628c9fd93..3547c1bca 100644
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -36,7 +36,8 @@ lib_LTLIBRARIES = libgnuradio-audio-oss.la
 
 libgnuradio_audio_oss_la_SOURCES = 	\
 	audio_oss_sink.cc		\
-	audio_oss_source.cc
+	audio_oss_source.cc		\
+	python/audio_oss.cc
 
 libgnuradio_audio_oss_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index ee9df7765..e8b6b39fe 100644
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -42,7 +42,8 @@ lib_LTLIBRARIES = libgnuradio-audio-osx.la
 
 libgnuradio_audio_osx_la_SOURCES = 	\
 	audio_osx_sink.cc		\
-	audio_osx_source.cc
+	audio_osx_source.cc		\
+	python/audio_osx.cc
 
 libgnuradio_audio_osx_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index 4fa098dcc..c5c8421c2 100644
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -42,7 +42,8 @@ lib_LTLIBRARIES = libgnuradio-audio-portaudio.la
 libgnuradio_audio_portaudio_la_SOURCES = \
 	audio_portaudio_sink.cc		\
 	audio_portaudio_source.cc	\
-	gri_portaudio.cc
+	gri_portaudio.cc			\
+	python/audio_portaudio.cc
 
 libgnuradio_audio_portaudio_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index d3e3f5a85..8b2b09910 100644
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -36,7 +36,8 @@ lib_LTLIBRARIES = libgnuradio-audio-windows.la
 
 libgnuradio_audio_windows_la_SOURCES = 	\
 	audio_windows_sink.cc		\
-	audio_windows_source.cc		
+	audio_windows_source.cc		\
+	python/audio_windows.cc
 
 libgnuradio_audio_windows_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index c5957f4ac..db1b58d52 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ b/gr-cvsd-vocoder/src/lib/Makefile.am
@@ -32,7 +32,8 @@ lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la
 
 libgnuradio_cvsd_vocoder_la_SOURCES = 	\
 	cvsd_decode_bs.cc		\
-	cvsd_encode_sb.cc
+	cvsd_encode_sb.cc		\
+	python/cvsd_vocoder.cc
 
 libgnuradio_cvsd_vocoder_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen
index 094aecfdb..3f04b83a1 100644
--- a/gr-gcell/src/Makefile.swig.gen
+++ b/gr-gcell/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ gcell_pylibdir_category ?= $(gcell_pythondir_category)
 gcell_pythondir = $(pythondir)/$(gcell_pythondir_category)
 gcell_pylibdir = $(pyexecdir)/$(gcell_pylibdir_category)
 
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+gcell_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gcell
+# FIXME: determince whether these should be installed with gnuradio.
+gcell_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 gcell_swigincludedir = $(swigincludedir)
@@ -72,7 +82,12 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += gcell.py gcell_python.cc
+# generating the py or scm file also generates the .cc or .h files,
+# but dependencies work better without the .cc ort .h files listed.
+swig_built_sources += gcell.py
+if GUILE
+swig_built_sources += gcell.scm
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -83,219 +98,50 @@ gcell_swiginclude_HEADERS =		\
 	$(gcell_swiginclude_headers)
 
 gcell_pylib_LTLIBRARIES =		\
-	_gcell_python.la
+	_gcell.la
 
-_gcell_python_la_SOURCES = 		\
-	gcell_python.cc		\
+_gcell_la_SOURCES = 			\
+	python/gcell.cc		\
 	$(gcell_la_swig_sources)
 
-_gcell_python_la_LIBADD =		\
+_gcell_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(gcell_la_swig_libadd)
 
-_gcell_python_la_LDFLAGS =		\
+# _gcell_la_DEPENDENCIES = python/gcell.lo
+
+_gcell_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(gcell_la_swig_ldflags)
 
-_gcell_python_la_CXXFLAGS =		\
+_gcell_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(gcell_la_swig_cxxflags)
 
 gcell_python_PYTHON =			\
 	gcell.py			\
-	$(gcell_python)
+	$(gcell)
 
 if GUILE
-gcell_pylib_LTLIBRARIES += _gcell_guile.la
-
-_gcell_guile_la_SOURCES = 		\
-	gcell_guile.cc		\
+gcell_scmlib_LTLIBRARIES = gcell_guile.la
+gcell_guile_la_SOURCES = 		\
+	guile/gcell.cc			\
 	$(gcell_la_swig_sources)
+gcell_scm_DATA = gcell.scm
 
 # Guile can use the same flags as python does
-_gcell_guile_la_LIBADD = $(_gcell_python_la_LIBADD)
-_gcell_guile_la_LDFLAGS = $(_gcell_python_la_LDFLAGS)
-_gcell_guile_la_CXXFLAGS = $(_gcell_python_la_CXXFLAGS)
+gcell_guile_la_LIBADD = $(_gcell_la_LIBADD)
+gcell_guile_la_LDFLAGS = $(_gcell_la_LDFLAGS)
+gcell_guile_la_CXXFLAGS = $(_gcell_la_CXXFLAGS)
 
-endif				# end of GUILE
+guile/gcell.lo: gcell.lo
+gcell.scm: gcell.i
 
-## Entry rule for running SWIG
-
-gcell_python.h gcell.py gcell_python.cc gcell_guile.cc gcell_guile.h: gcell.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/gcell-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/gcell-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/gcell-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/gcell-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-guile-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/gcell-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/gcell-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/gcell-generate-python-stamp; \
-		exit $$?; \
-	fi;
-
-$(DEPDIR)/gcell-generate-guile-stamp:
-if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gcell_swig_args) \
-		-MD -MF $(DEPDIR)/gcell_guile.Std \
-		-module gcell -o gcell_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/gcell_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell_guile.Std \
-			> $(DEPDIR)/gcell_guile.Sd; \
-		$(RM) $(DEPDIR)/gcell_guile.Std; \
-		$(MV) $(DEPDIR)/gcell_guile.Sd $(DEPDIR)/gcell_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/gcell_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/gcell-generate-guile-stamp
-	$(RM) $(DEPDIR)/gcell_guile.d
-	cp $(DEPDIR)/gcell_guile.Std $(DEPDIR)/gcell_guile.d
-	echo "" >> $(DEPDIR)/gcell_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell_guile.d
-	$(RM) $(DEPDIR)/gcell_guile.Std
-	touch $(DEPDIR)/gcell-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/gcell_guile.d@am__quote@
-endif
-
-$(DEPDIR)/gcell-generate-python-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gcell_swig_args) \
-		-MD -MF $(DEPDIR)/gcell_python.Std \
-		-module gcell -o gcell_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/gcell_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell_python.Std \
-			> $(DEPDIR)/gcell_python.Sd; \
-		$(RM) $(DEPDIR)/gcell_python.Std; \
-		$(MV) $(DEPDIR)/gcell_python.Sd $(DEPDIR)/gcell_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/gcell_python.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/gcell_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/gcell_python.Std $(DEPDIR)/gcell_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/gcell_python.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/gcell_python.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/gcell-generate-python-stamp
+endif				# end of GUILE
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+python/gcell.lo:
+gcell.lo: gcell.py gcell.scm
+gcell.py: gcell.i
 
-@am__include@ @am__quote@./$(DEPDIR)/gcell_python.d@am__quote@
 
diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index f6dbd2fb8..3a054a89b 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -40,12 +40,13 @@ libgnuradio_msdd6000_rs_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 libgnuradio_msdd6000_la_SOURCES = 	\
 	msdd_source_simple.cc		\
-	msdd6000.cc
-
+	msdd6000.cc			\
+	python/msdd.cc
 
 libgnuradio_msdd6000_rs_la_SOURCES = 	\
-	msdd_rs_source_simple.cc		\
-	msdd6000_rs.cc
+	msdd_rs_source_simple.cc	\
+	msdd6000_rs.cc			\
+	python/msdd_rs.cc
 
 libgnuradio_msdd6000_la_LIBADD = 	\
 	$(GNURADIO_CORE_LA)
diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am
index fdc1476cd..bdf75b610 100644
--- a/gr-noaa/lib/Makefile.am
+++ b/gr-noaa/lib/Makefile.am
@@ -31,7 +31,10 @@ lib_LTLIBRARIES = \
 libgnuradio_noaa_la_SOURCES = \
 	noaa_hrpt_decoder.cc \
 	noaa_hrpt_deframer.cc \
-	noaa_hrpt_pll_cf.cc
+	noaa_hrpt_pll_cf.cc	\
+	python/noaa_hrpt_decoder.cc \
+	python/noaa_hrpt_deframer.cc \
+	python/noaa_hrpt_pll_cf.cc	
 
 noinst_HEADERS = \
 	noaa_hrpt.h
@@ -44,4 +47,4 @@ libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 grinclude_HEADERS = \
 	noaa_hrpt_decoder.h \
 	noaa_hrpt_deframer.h \
-	noaa_hrpt_pll_cf.h
\ No newline at end of file
+	noaa_hrpt_pll_cf.h
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1ee3c8e3d..dce8f1bd5 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -53,7 +53,8 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	spectrumUpdateEvents.cc			\
 	plot_waterfall.cc			\
 	qtgui_sink_c.cc				\
-	qtgui_sink_f.cc
+	qtgui_sink_f.cc				\
+	python/qtgui.cc
 
 nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES)
 
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 3e1803554..4223474f7 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -77,7 +77,7 @@ libgnuradio_trellis_la_SOURCES = 	\
         trellis_permutation.cc		\
 	trellis_siso_f.cc		\
 	trellis_siso_combined_f.cc	\
-	$(GENERATED_CC)
+	python/trellis.cc
 
 libgnuradio_trellis_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 45cedfb21..1824f1de0 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -37,7 +37,9 @@ lib_LTLIBRARIES = libgnuradio-video-sdl.la
 
 libgnuradio_video_sdl_la_SOURCES = 	\
 	video_sdl_sink_uc.cc		\
-	video_sdl_sink_s.cc
+	video_sdl_sink_s.cc			\
+	python/video_sdl.cc
+	
 
 libgnuradio_video_sdl_la_LIBADD =	\
 	$(SDL_LIBS)			\