additional regenerated files

4 files changed, 20 insertions, 8 deletions

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index b6551eadb..52c8a7473 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ qtgui_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/qtgui
 # FIXME: determince whether these should be installed with gnuradio.
-qtgui_scmdir = $(guiledir)/gnuradio
+qtgui_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la
 libguile_qtgui_la_SOURCES = 		\
 	guile/qtgui.cc			\
 	$(qtgui_la_swig_sources)
-qtgui_scm_DATA = qtgui.scm
+nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_qtgui_la_LIBADD = $(_qtgui_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_qtgui_la_CXXFLAGS = $(_qtgui_la_CXXFLAGS)
 
 guile/qtgui.lo: qtgui.lo
 qtgui.scm: qtgui.i
+gnuradio/qtgui-primitive.scm: qtgui.scm
+
+-include guile/qtgui.d
 
 endif				# end of GUILE
 
diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 88ed33834..86ead5b00 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ uhd_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/uhd_swig
 # FIXME: determince whether these should be installed with gnuradio.
-uhd_swig_scmdir = $(guiledir)/gnuradio
+uhd_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la
 libguile_uhd_swig_la_SOURCES = 		\
 	guile/uhd_swig.cc			\
 	$(uhd_swig_la_swig_sources)
-uhd_swig_scm_DATA = uhd_swig.scm
+nobase_uhd_swig_scm_DATA = gnuradio/uhd_swig.scm gnuradio/uhd_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS)
 
 guile/uhd_swig.lo: uhd_swig.lo
 uhd_swig.scm: uhd_swig.i
+gnuradio/uhd_swig-primitive.scm: uhd_swig.scm
+
+-include guile/uhd_swig.d
 
 endif				# end of GUILE
 
diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 72a4285d6..7099b0bd9 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ usrp_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_swig
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmdir = $(guiledir)/gnuradio
+usrp_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la
 libguile_usrp_swig_la_SOURCES = 		\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
-usrp_swig_scm_DATA = usrp_swig.scm
+nobase_usrp_swig_scm_DATA = gnuradio/usrp_swig.scm gnuradio/usrp_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
 guile/usrp_swig.lo: usrp_swig.lo
 usrp_swig.scm: usrp_swig.i
+gnuradio/usrp_swig-primitive.scm: usrp_swig.scm
+
+-include guile/usrp_swig.d
 
 endif				# end of GUILE
 
diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 32fbfa35e..16e23dccd 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ usrp_prims_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_prims
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmdir = $(guiledir)/gnuradio
+usrp_prims_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la
 libguile_usrp_prims_la_SOURCES = 		\
 	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
-usrp_prims_scm_DATA = usrp_prims.scm
+nobase_usrp_prims_scm_DATA = gnuradio/usrp_prims.scm gnuradio/usrp_prims-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
 guile/usrp_prims.lo: usrp_prims.lo
 usrp_prims.scm: usrp_prims.i
+gnuradio/usrp_prims-primitive.scm: usrp_prims.scm
+
+-include guile/usrp_prims.d
 
 endif				# end of GUILE