From b47b9ca40ecf49afa44c993b8da9af4ff876c9ba Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 13 Oct 2010 22:25:16 -0600
Subject: regenerated from template
---
gr-pager/swig/Makefile.swig.gen | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 5cfbc66be..8870c674b 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -72,7 +72,7 @@ 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 += pager_swig.py pager_swig.cc
+swig_built_sources += pager_swig.py pager_swig-python.cc
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ pager_swig_pylib_LTLIBRARIES = \
_pager_swig.la
_pager_swig_la_SOURCES = \
- pager_swig.cc \
+ pager_swig-python.cc \
$(pager_swig_la_swig_sources)
_pager_swig_la_LIBADD = \
@@ -107,7 +107,7 @@ pager_swig_python_PYTHON = \
## Entry rule for running SWIG
-pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
+pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
@@ -159,11 +159,12 @@ pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
##
## Remove the stamp associated with this filename.
##
- rm -f $(DEPDIR)/pager_swig-generate-stamp; \
+ rm -f $(DEPDIR)/pager_swig-generate-*stamp; \
##
## Tell MAKE to run the rule for creating this stamp.
##
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-stamp WHAT=$<; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-python-stamp WHAT=$<; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-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
@@ -187,11 +188,27 @@ pager_swig.h pager_swig.py pager_swig.cc: pager_swig.i
## Succeed if and only if the first process succeeded; exit this
## process returning the status of the generated stamp.
##
- test -f $(DEPDIR)/pager_swig-generate-stamp; \
+ test -f $(DEPDIR)/pager_swig-generate-python-stamp; \
exit $$?; \
fi;
-$(DEPDIR)/pager_swig-generate-stamp:
+$(DEPDIR)/pager_swig-generate-guile-stamp:
+ if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
+ -MD -MF $(DEPDIR)/pager_swig.Std \
+ -module pager_swig -o pager_swig-guile.cc $(WHAT); then \
+ if test $(host_os) = mingw32; then \
+ $(RM) $(DEPDIR)/pager_swig.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
+ > $(DEPDIR)/pager_swig.Sd; \
+ $(RM) $(DEPDIR)/pager_swig.Std; \
+ $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \
+ fi; \
+ else \
+ $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \
+ fi;
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+
+$(DEPDIR)/pager_swig-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
@@ -202,7 +219,7 @@ $(DEPDIR)/pager_swig-generate-stamp:
##
if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \
-MD -MF $(DEPDIR)/pager_swig.Std \
- -module pager_swig -o pager_swig.cc $(WHAT); then \
+ -module pager_swig -o pager_swig-python.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
$(RM) $(DEPDIR)/pager_swig.Sd; \
$(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/pager_swig-generate-stamp:
## executing this rule; allows other threads waiting on this process
## to continue.
##
- touch $(DEPDIR)/pager_swig-generate-stamp
+ touch $(DEPDIR)/pager_swig-generate-python-stamp
# KLUDGE: Force runtime include of a SWIG dependency file. This is
# not guaranteed to be portable, but will probably work. If it works,
--
cgit
From ed4094208c501e91838ccc333059e4731e8ae908 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 14 Oct 2010 12:34:08 -0600
Subject: regenerated after changes to the template
---
gr-pager/swig/Makefile.swig.gen | 36 ++++++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 10 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 8870c674b..48567ad4f 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -72,7 +72,7 @@ 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 += pager_swig.py pager_swig-python.cc
+swig_built_sources += pager_swig.py pager_swig_python.cc
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
@@ -83,21 +83,21 @@ pager_swig_swiginclude_HEADERS = \
$(pager_swig_swiginclude_headers)
pager_swig_pylib_LTLIBRARIES = \
- _pager_swig.la
+ _pager_swig_python.la
-_pager_swig_la_SOURCES = \
- pager_swig-python.cc \
+_pager_swig_python_la_SOURCES = \
+ pager_swig_python.cc \
$(pager_swig_la_swig_sources)
-_pager_swig_la_LIBADD = \
+_pager_swig_python_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(pager_swig_la_swig_libadd)
-_pager_swig_la_LDFLAGS = \
+_pager_swig_python_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(pager_swig_la_swig_ldflags)
-_pager_swig_la_CXXFLAGS = \
+_pager_swig_python_la_CXXFLAGS = \
$(STD_SWIG_CXX_FLAGS) \
$(pager_swig_la_swig_cxxflags)
@@ -105,9 +105,23 @@ pager_swig_python_PYTHON = \
pager_swig.py \
$(pager_swig_python)
+if GUILE
+pager_swig_pylib_LTLIBRARIES += _pager_swig_guile.la
+
+_pager_swig_guile_la_SOURCES = \
+ pager_swig_guile.cc \
+ $(pager_swig_la_swig_sources)
+
+# Guile can use the same flags as python does
+_pager_swig_guile_la_LIBADD = $(_pager_swig_python_la_LIBADD)
+_pager_swig_guile_la_LDFLAGS = $(_pager_swig_python_la_LDFLAGS)
+_pager_swig_guile_la_CXXFLAGS = $(_pager_swig_python_la_CXXFLAGS)
+
+endif # end of GUILE
+
## Entry rule for running SWIG
-pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i
+pager_swig.h pager_swig.py pager_swig_python.cc: pager_swig.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
@@ -193,9 +207,10 @@ pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i
fi;
$(DEPDIR)/pager_swig-generate-guile-stamp:
+if GUILE
if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
-MD -MF $(DEPDIR)/pager_swig.Std \
- -module pager_swig -o pager_swig-guile.cc $(WHAT); then \
+ -module pager_swig -o pager_swig_guile.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
$(RM) $(DEPDIR)/pager_swig.Sd; \
$(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
@@ -207,6 +222,7 @@ $(DEPDIR)/pager_swig-generate-guile-stamp:
$(RM) $(DEPDIR)/pager_swig.S*; exit 1; \
fi;
touch $(DEPDIR)/pager_swig-generate-guile-stamp
+endif
$(DEPDIR)/pager_swig-generate-python-stamp:
## This rule will be called only by the first process issuing the
@@ -219,7 +235,7 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
##
if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \
-MD -MF $(DEPDIR)/pager_swig.Std \
- -module pager_swig -o pager_swig-python.cc $(WHAT); then \
+ -module pager_swig -o pager_swig_python.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
$(RM) $(DEPDIR)/pager_swig.Sd; \
$(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
--
cgit
From b866f36454af0defea79d84647a8a1652fb2fbdb Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 16 Oct 2010 09:46:48 -0600
Subject: regenerated after changes to .i files
---
gr-pager/swig/Makefile.swig.gen | 53 ++++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 22 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 48567ad4f..5518e541b 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -121,7 +121,7 @@ endif # end of GUILE
## Entry rule for running SWIG
-pager_swig.h pager_swig.py pager_swig_python.cc: pager_swig.i
+pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager_swig_guile.h: pager_swig.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
@@ -209,19 +209,28 @@ pager_swig.h pager_swig.py pager_swig_python.cc: pager_swig.i
$(DEPDIR)/pager_swig-generate-guile-stamp:
if GUILE
if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
- -MD -MF $(DEPDIR)/pager_swig.Std \
+ -MD -MF $(DEPDIR)/pager_swig_guile.Std \
-module pager_swig -o pager_swig_guile.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/pager_swig.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
- > $(DEPDIR)/pager_swig.Sd; \
- $(RM) $(DEPDIR)/pager_swig.Std; \
- $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \
+ $(RM) $(DEPDIR)/pager_swig_guile.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_guile.Std \
+ > $(DEPDIR)/pager_swig_guile.Sd; \
+ $(RM) $(DEPDIR)/pager_swig_guile.Std; \
+ $(MV) $(DEPDIR)/pager_swig_guile.Sd $(DEPDIR)/pager_swig_guile.Std; \
fi; \
else \
- $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \
+ $(RM) $(DEPDIR)/pager_swig_guile.S*; exit 1; \
fi;
touch $(DEPDIR)/pager_swig-generate-guile-stamp
+ $(RM) $(DEPDIR)/pager_swig_guile.d
+ cp $(DEPDIR)/pager_swig_guile.Std $(DEPDIR)/pager_swig_guile.d
+ echo "" >> $(DEPDIR)/pager_swig_guile.d
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig_guile.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
+ $(RM) $(DEPDIR)/pager_swig_guile.Std
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
endif
$(DEPDIR)/pager_swig-generate-python-stamp:
@@ -234,17 +243,17 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
## post-processing on 'mingw32' host OS for the dependency file.
##
if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \
- -MD -MF $(DEPDIR)/pager_swig.Std \
+ -MD -MF $(DEPDIR)/pager_swig_python.Std \
-module pager_swig -o pager_swig_python.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/pager_swig.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \
- > $(DEPDIR)/pager_swig.Sd; \
- $(RM) $(DEPDIR)/pager_swig.Std; \
- $(MV) $(DEPDIR)/pager_swig.Sd $(DEPDIR)/pager_swig.Std; \
+ $(RM) $(DEPDIR)/pager_swig_python.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_python.Std \
+ > $(DEPDIR)/pager_swig_python.Sd; \
+ $(RM) $(DEPDIR)/pager_swig_python.Std; \
+ $(MV) $(DEPDIR)/pager_swig_python.Sd $(DEPDIR)/pager_swig_python.Std; \
fi; \
else \
- $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \
+ $(RM) $(DEPDIR)/pager_swig_python.S*; exit 1; \
fi;
##
## Mess with the SWIG output .Std dependency file, to create a
@@ -256,27 +265,27 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
##
## (1) remove the current dependency file
##
- $(RM) $(DEPDIR)/pager_swig.d
+ $(RM) $(DEPDIR)/pager_swig_python.d
##
## (2) Copy the whole SWIG file:
##
- cp $(DEPDIR)/pager_swig.Std $(DEPDIR)/pager_swig.d
+ cp $(DEPDIR)/pager_swig_python.Std $(DEPDIR)/pager_swig_python.d
##
## (3) all a carriage return to the end of the dependency file.
##
- echo "" >> $(DEPDIR)/pager_swig.d
+ echo "" >> $(DEPDIR)/pager_swig_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)/pager_swig.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig.d
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig_python.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_python.d
##
## (5) remove the SWIG-generated file
##
- $(RM) $(DEPDIR)/pager_swig.Std
+ $(RM) $(DEPDIR)/pager_swig_python.Std
##
## Create the stamp for this filename generation, to signal success in
## executing this rule; allows other threads waiting on this process
@@ -288,5 +297,5 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
# not guaranteed to be portable, but will probably work. If it works,
# we have accurate dependencies for our swig stuff, which is good.
-@am__include@ @am__quote@./$(DEPDIR)/pager_swig.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
--
cgit
From 5ea1059c943a8a6dcb67c2a151f27b84b653f549 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 18:15:58 -0600
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 54 ++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 27 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 5518e541b..b260bf4ce 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -206,33 +206,6 @@ pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager
exit $$?; \
fi;
-$(DEPDIR)/pager_swig-generate-guile-stamp:
-if GUILE
- if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
- -MD -MF $(DEPDIR)/pager_swig_guile.Std \
- -module pager_swig -o pager_swig_guile.cc $(WHAT); then \
- if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/pager_swig_guile.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_guile.Std \
- > $(DEPDIR)/pager_swig_guile.Sd; \
- $(RM) $(DEPDIR)/pager_swig_guile.Std; \
- $(MV) $(DEPDIR)/pager_swig_guile.Sd $(DEPDIR)/pager_swig_guile.Std; \
- fi; \
- else \
- $(RM) $(DEPDIR)/pager_swig_guile.S*; exit 1; \
- fi;
- touch $(DEPDIR)/pager_swig-generate-guile-stamp
- $(RM) $(DEPDIR)/pager_swig_guile.d
- cp $(DEPDIR)/pager_swig_guile.Std $(DEPDIR)/pager_swig_guile.d
- echo "" >> $(DEPDIR)/pager_swig_guile.d
- $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig_guile.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
- $(RM) $(DEPDIR)/pager_swig_guile.Std
- touch $(DEPDIR)/pager_swig-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
-endif
-
$(DEPDIR)/pager_swig-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
@@ -299,3 +272,30 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
+$(DEPDIR)/pager_swig-generate-guile-stamp:
+if GUILE
+ if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
+ -MD -MF $(DEPDIR)/pager_swig_guile.Std \
+ -module pager_swig -o pager_swig_guile.cc $(WHAT); then \
+ if test $(host_os) = mingw32; then \
+ $(RM) $(DEPDIR)/pager_swig_guile.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_guile.Std \
+ > $(DEPDIR)/pager_swig_guile.Sd; \
+ $(RM) $(DEPDIR)/pager_swig_guile.Std; \
+ $(MV) $(DEPDIR)/pager_swig_guile.Sd $(DEPDIR)/pager_swig_guile.Std; \
+ fi; \
+ else \
+ $(RM) $(DEPDIR)/pager_swig_guile.S*; exit 1; \
+ fi;
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+ $(RM) $(DEPDIR)/pager_swig_guile.d
+ cp $(DEPDIR)/pager_swig_guile.Std $(DEPDIR)/pager_swig_guile.d
+ echo "" >> $(DEPDIR)/pager_swig_guile.d
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig_guile.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
+ $(RM) $(DEPDIR)/pager_swig_guile.Std
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
+endif
+
--
cgit
From 25bf9bbd0c5b702acf26e05d5a9966fd323f6614 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 21:45:11 -0600
Subject: don't ifdef the target away. regenerate .gen files.
---
gr-pager/swig/Makefile.swig.gen | 51 +++++++++++++++++++++++++++++++++++------
1 file changed, 44 insertions(+), 7 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index b260bf4ce..1721fbfe5 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ pager_swig_pylibdir_category ?= $(pager_swig_pythondir_category)
pager_swig_pythondir = $(pythondir)/$(pager_swig_pythondir_category)
pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_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.
+pager_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/pager_swig
+# FIXME: determince whether these should be installed with gnuradio.
+pager_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
pager_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += pager_swig.py pager_swig_python.cc
+if GUILE
+swig_built_sources += pager_swig.scm pager_swig_guile.cc
+endif
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
@@ -106,11 +119,11 @@ pager_swig_python_PYTHON = \
$(pager_swig_python)
if GUILE
-pager_swig_pylib_LTLIBRARIES += _pager_swig_guile.la
-
+pager_swig_scmlib_LTLIBRARIES = _pager_swig_guile.la
_pager_swig_guile_la_SOURCES = \
- pager_swig_guile.cc \
+ pager_swig_guile.cc \
$(pager_swig_la_swig_sources)
+pager_swig_scm_DATA = pager_swig.scm
# Guile can use the same flags as python does
_pager_swig_guile_la_LIBADD = $(_pager_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager_swig_guile.h: pager_swig.i
+# $(python_deps) $(guile_deps): pager_swig.i
+pager_swig_python.h pager_swig.py pager_swig_python.cc: pager_swig.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
@@ -178,7 +192,6 @@ pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-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
@@ -206,6 +219,24 @@ pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager
exit $$?; \
fi;
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+pager_swig_guile.h pager_swig.scm pager_swig_guile.cc: pager_swig.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/pager_swig-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/pager_swig-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/pager_swig-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/pager_swig-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/pager_swig-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/pager_swig-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/pager_swig-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
@@ -272,8 +303,10 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
-$(DEPDIR)/pager_swig-generate-guile-stamp:
if GUILE
+$(DEPDIR)/pager_swig-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
-MD -MF $(DEPDIR)/pager_swig_guile.Std \
-module pager_swig -o pager_swig_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
$(RM) $(DEPDIR)/pager_swig_guile.Std
touch $(DEPDIR)/pager_swig-generate-guile-stamp
+else
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
--
cgit
From 42753aad1c8170bf1a4d4003d636ac5a81cbbda3 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 22:07:32 -0600
Subject: regeneratd
---
gr-pager/swig/Makefile.swig.gen | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 1721fbfe5..b3f47e0e6 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -303,8 +303,8 @@ $(DEPDIR)/pager_swig-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
-if GUILE
$(DEPDIR)/pager_swig-generate-guile-stamp:
+if GUILE
# the comments for the target above apply to this target as well, but it seemed
# silly to include them twice. The only main change is for guile.
if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
--
cgit
From aa162012cc25cf080ee744a2cb795a6154fcca86 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:16:05 -0600
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 241 +++++-----------------------------------
1 file changed, 25 insertions(+), 216 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index b3f47e0e6..feddc65de 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -82,9 +82,11 @@ 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 += pager_swig.py pager_swig_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 += pager_swig.py
if GUILE
-swig_built_sources += pager_swig.scm pager_swig_guile.cc
+swig_built_sources += pager_swig.scm
endif
## Various SWIG variables. These can be overloaded in the including
@@ -96,243 +98,50 @@ pager_swig_swiginclude_HEADERS = \
$(pager_swig_swiginclude_headers)
pager_swig_pylib_LTLIBRARIES = \
- _pager_swig_python.la
+ _pager_swig.la
-_pager_swig_python_la_SOURCES = \
- pager_swig_python.cc \
+_pager_swig_la_SOURCES = \
+ python/pager_swig.cc \
$(pager_swig_la_swig_sources)
-_pager_swig_python_la_LIBADD = \
+_pager_swig_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(pager_swig_la_swig_libadd)
-_pager_swig_python_la_LDFLAGS = \
+# _pager_swig_la_DEPENDENCIES = python/pager_swig.lo
+
+_pager_swig_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(pager_swig_la_swig_ldflags)
-_pager_swig_python_la_CXXFLAGS = \
+_pager_swig_la_CXXFLAGS = \
$(STD_SWIG_CXX_FLAGS) \
+ -I$(top_builddir) \
$(pager_swig_la_swig_cxxflags)
pager_swig_python_PYTHON = \
pager_swig.py \
- $(pager_swig_python)
+ $(pager_swig)
if GUILE
-pager_swig_scmlib_LTLIBRARIES = _pager_swig_guile.la
-_pager_swig_guile_la_SOURCES = \
- pager_swig_guile.cc \
+pager_swig_scmlib_LTLIBRARIES = pager_swig_guile.la
+pager_swig_guile_la_SOURCES = \
+ guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
pager_swig_scm_DATA = pager_swig.scm
# Guile can use the same flags as python does
-_pager_swig_guile_la_LIBADD = $(_pager_swig_python_la_LIBADD)
-_pager_swig_guile_la_LDFLAGS = $(_pager_swig_python_la_LDFLAGS)
-_pager_swig_guile_la_CXXFLAGS = $(_pager_swig_python_la_CXXFLAGS)
-
-endif # end of GUILE
+pager_swig_guile_la_LIBADD = $(_pager_swig_la_LIBADD)
+pager_swig_guile_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
+pager_swig_guile_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): pager_swig.i
-pager_swig_python.h pager_swig.py pager_swig_python.cc: pager_swig.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)/pager_swig-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)/pager_swig-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)/pager_swig-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)/pager_swig-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-python-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)/pager_swig-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)/pager_swig-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)/pager_swig-generate-python-stamp; \
- exit $$?; \
- fi;
+guile/pager_swig.lo: pager_swig.lo
+pager_swig.scm: pager_swig.i
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
-pager_swig_guile.h pager_swig.scm pager_swig_guile.cc: pager_swig.i
-if GUILE
- trap 'rm -rf $(DEPDIR)/pager_swig-generate-*' 1 2 13 15; \
- if mkdir $(DEPDIR)/pager_swig-generate-lock 2>/dev/null; then \
- rm -f $(DEPDIR)/pager_swig-generate-*stamp; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-guile-stamp WHAT=$<; \
- rmdir $(DEPDIR)/pager_swig-generate-lock; \
- else \
- while test -d $(DEPDIR)/pager_swig-generate-lock; do \
- sleep 1; \
- done; \
- test -f $(DEPDIR)/pager_swig-generate-guile-stamp; \
- exit $$?; \
- fi;
endif # end of GUILE
-$(DEPDIR)/pager_swig-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) $(pager_swig_swig_args) \
- -MD -MF $(DEPDIR)/pager_swig_python.Std \
- -module pager_swig -o pager_swig_python.cc $(WHAT); then \
- if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/pager_swig_python.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_python.Std \
- > $(DEPDIR)/pager_swig_python.Sd; \
- $(RM) $(DEPDIR)/pager_swig_python.Std; \
- $(MV) $(DEPDIR)/pager_swig_python.Sd $(DEPDIR)/pager_swig_python.Std; \
- fi; \
- else \
- $(RM) $(DEPDIR)/pager_swig_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)/pager_swig_python.d
-##
-## (2) Copy the whole SWIG file:
-##
- cp $(DEPDIR)/pager_swig_python.Std $(DEPDIR)/pager_swig_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
- echo "" >> $(DEPDIR)/pager_swig_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)/pager_swig_python.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_python.d
-##
-## (5) remove the SWIG-generated file
-##
- $(RM) $(DEPDIR)/pager_swig_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)/pager_swig-generate-python-stamp
-
-# 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.
-
-@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
-
-$(DEPDIR)/pager_swig-generate-guile-stamp:
-if GUILE
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
- if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \
- -MD -MF $(DEPDIR)/pager_swig_guile.Std \
- -module pager_swig -o pager_swig_guile.cc $(WHAT); then \
- if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/pager_swig_guile.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig_guile.Std \
- > $(DEPDIR)/pager_swig_guile.Sd; \
- $(RM) $(DEPDIR)/pager_swig_guile.Std; \
- $(MV) $(DEPDIR)/pager_swig_guile.Sd $(DEPDIR)/pager_swig_guile.Std; \
- fi; \
- else \
- $(RM) $(DEPDIR)/pager_swig_guile.S*; exit 1; \
- fi;
- touch $(DEPDIR)/pager_swig-generate-guile-stamp
- $(RM) $(DEPDIR)/pager_swig_guile.d
- cp $(DEPDIR)/pager_swig_guile.Std $(DEPDIR)/pager_swig_guile.d
- echo "" >> $(DEPDIR)/pager_swig_guile.d
- $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/pager_swig_guile.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
- $(RM) $(DEPDIR)/pager_swig_guile.Std
- touch $(DEPDIR)/pager_swig-generate-guile-stamp
-else
- touch $(DEPDIR)/pager_swig-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
+python/pager_swig.lo:
+pager_swig.lo: pager_swig.py pager_swig.scm
+pager_swig.py: pager_swig.i
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
--
cgit
From 1e34972f4433cbfef3500fc73a285c7c436cfd6b Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 22:00:09 -0700
Subject: Rengenerate Makefile.swig.gen's
---
gr-pager/swig/Makefile.swig.gen | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index feddc65de..93d9fcdc0 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -41,12 +41,12 @@ pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_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.
-pager_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+pager_swig_scmlibdir = $(libdir)/guile/gnuradio
# The scm files for the guile modules get installed where ever guile
# is installed, usually /usr/share/guile/site/pager_swig
# FIXME: determince whether these should be installed with gnuradio.
-pager_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+pager_swig_scmdir = $(guiledir)/gnuradio
## SWIG headers are always installed into the same directory.
@@ -144,4 +144,5 @@ python/pager_swig.lo:
pager_swig.lo: pager_swig.py pager_swig.scm
pager_swig.py: pager_swig.i
+-include python/pager_swig.d
--
cgit
From 6421d47062f4bf5abbdf26142616a5965f1edfa0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 23:28:06 -0700
Subject: regenerate
---
gr-pager/swig/Makefile.swig.gen | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 93d9fcdc0..2d198ee70 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -41,7 +41,7 @@ pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_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.
-pager_swig_scmlibdir = $(libdir)/guile/gnuradio
+pager_swig_scmlibdir = $(libdir)
# The scm files for the guile modules get installed where ever guile
# is installed, usually /usr/share/guile/site/pager_swig
@@ -124,16 +124,16 @@ pager_swig_python_PYTHON = \
$(pager_swig)
if GUILE
-pager_swig_scmlib_LTLIBRARIES = pager_swig_guile.la
-pager_swig_guile_la_SOURCES = \
+pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
+libguile_pager_swig_la_SOURCES = \
guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
pager_swig_scm_DATA = pager_swig.scm
# Guile can use the same flags as python does
-pager_swig_guile_la_LIBADD = $(_pager_swig_la_LIBADD)
-pager_swig_guile_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
-pager_swig_guile_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
+libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
+libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
+libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
guile/pager_swig.lo: pager_swig.lo
pager_swig.scm: pager_swig.i
--
cgit
From 40fac3c4a2f5f1f6dde79e96be8f40535e11343b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:16 -0600
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 2d198ee70..4d0ff3b0e 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -46,7 +46,7 @@ pager_swig_scmlibdir = $(libdir)
# The scm files for the guile modules get installed where ever guile
# is installed, usually /usr/share/guile/site/pager_swig
# FIXME: determince whether these should be installed with gnuradio.
-pager_swig_scmdir = $(guiledir)/gnuradio
+pager_swig_scmdir = $(guiledir)
## SWIG headers are always installed into the same directory.
@@ -128,7 +128,7 @@ pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
libguile_pager_swig_la_SOURCES = \
guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
-pager_swig_scm_DATA = pager_swig.scm
+nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
# Guile can use the same flags as python does
libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
guile/pager_swig.lo: pager_swig.lo
pager_swig.scm: pager_swig.i
+gnuradio/pager_swig-primitive.scm: pager_swig.scm
+
+-include guile/pager_swig.d
endif # end of GUILE
--
cgit
From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:41 -0600
Subject: add load-extension support
---
gr-pager/swig/pager_swig.i | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index 66d6de7d8..5561c26fc 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -34,3 +34,13 @@
%include "pager_flex_sync.i"
%include "pager_flex_deinterleave.i"
%include "pager_flex_parse.i"
+
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-pager_swig" "scm_init_gnuradio_pager_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
--
cgit
From 2b11c904da6799b6a7240d64d2ba37ddcaf1e479 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 16:06:37 -0600
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 4d0ff3b0e..3a719394b 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
# 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 += pager_swig.py
-if GUILE
-swig_built_sources += pager_swig.scm
-endif
+# swig_built_sources += pager_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/pager_swig.scm
+# endif
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
-guile/pager_swig.lo: pager_swig.lo
-pager_swig.scm: pager_swig.i
-gnuradio/pager_swig-primitive.scm: pager_swig.scm
+guile/pager_swig.cc: gnuradio/pager_swig.scm
+gnuradio/pager_swig.scm: pager_swig.i
+gnuradio/pager_swig-primitive.scm: gnuradio/pager_swig.scm
-include guile/pager_swig.d
endif # end of GUILE
-python/pager_swig.lo:
pager_swig.lo: pager_swig.py pager_swig.scm
pager_swig.py: pager_swig.i
--
cgit
From 0939607d0b4a3ae047ceff60fab300000c7d2069 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 19:02:55 -0600
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 37 ++++++++++---------------------------
1 file changed, 10 insertions(+), 27 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 3a719394b..5321807fb 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -67,28 +67,10 @@ pager_swig_swigincludedir = $(swigincludedir)
## right thing. For more info, see <
## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-## Stamps used to ensure parallel make does the right thing. These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built. These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/pager_swig-generate-*
-
## Other cleaned files: dependency files generated by SWIG or this Makefile
MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-## Add the .py and .cc files to the list of SWIG built sources. The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-# 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 += pager_swig.py
-# if GUILE
-# swig_built_sources += gnuradio/pager_swig.scm
-# endif
-
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
## Makefile.swig .
@@ -108,8 +90,6 @@ _pager_swig_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(pager_swig_la_swig_libadd)
-# _pager_swig_la_DEPENDENCIES = python/pager_swig.lo
-
_pager_swig_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(pager_swig_la_swig_ldflags)
@@ -123,14 +103,20 @@ pager_swig_python_PYTHON = \
pager_swig.py \
$(pager_swig)
+python/pager_swig.cc: pager_swig.py
+pager_swig.py: pager_swig.i
+
+# Include the python dependencies for this file
+-include python/pager_swig.d
+# end of PYTHON
+
if GUILE
pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
-libguile_pager_swig_la_SOURCES = \
- guile/pager_swig.cc \
+libguile_pager_swig_la_SOURCES = \
+ guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
-# Guile can use the same flags as python does
libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/pager_swig.cc: gnuradio/pager_swig.scm
gnuradio/pager_swig.scm: pager_swig.i
gnuradio/pager_swig-primitive.scm: gnuradio/pager_swig.scm
+# Include the guile dependencies for this file
-include guile/pager_swig.d
endif # end of GUILE
-pager_swig.lo: pager_swig.py pager_swig.scm
-pager_swig.py: pager_swig.i
-
--include python/pager_swig.d
--
cgit
From df92b7c6315c567e58e0d9c293d7c9c2699023d3 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 10 Nov 2010 13:01:38 -0800
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 5321807fb..3f54ab809 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -112,8 +112,8 @@ pager_swig.py: pager_swig.i
if GUILE
pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
-libguile_pager_swig_la_SOURCES = \
- guile/pager_swig.cc \
+libguile_pager_swig_la_SOURCES = \
+ guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
--
cgit
From 8180bb1d7020e07c9b0a217820c68d07f0d98a74 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:33:50 -0800
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 3f54ab809..d62212b17 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -101,7 +101,7 @@ _pager_swig_la_CXXFLAGS = \
pager_swig_python_PYTHON = \
pager_swig.py \
- $(pager_swig)
+ $(pager_swig_python)
python/pager_swig.cc: pager_swig.py
pager_swig.py: pager_swig.i
--
cgit
From ff877cabe2384dc2155ef5af92ee8b959fd29806 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Fri, 19 Nov 2010 08:07:52 -0700
Subject: regenerated
---
gr-pager/swig/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index d62212b17..1b74c3be7 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -79,6 +79,7 @@ pager_swig_swiginclude_HEADERS = \
pager_swig.i \
$(pager_swig_swiginclude_headers)
+if PYTHON
pager_swig_pylib_LTLIBRARIES = \
_pager_swig.la
@@ -86,6 +87,10 @@ _pager_swig_la_SOURCES = \
python/pager_swig.cc \
$(pager_swig_la_swig_sources)
+pager_swig_python_PYTHON = \
+ pager_swig.py \
+ $(pager_swig_python)
+
_pager_swig_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(pager_swig_la_swig_libadd)
@@ -99,27 +104,34 @@ _pager_swig_la_CXXFLAGS = \
-I$(top_builddir) \
$(pager_swig_la_swig_cxxflags)
-pager_swig_python_PYTHON = \
- pager_swig.py \
- $(pager_swig_python)
-
python/pager_swig.cc: pager_swig.py
pager_swig.py: pager_swig.i
# Include the python dependencies for this file
-include python/pager_swig.d
-# end of PYTHON
+
+endif # end of if python
if GUILE
-pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la
+
+pager_swig_scmlib_LTLIBRARIES = \
+ libguile-pager_swig.la
libguile_pager_swig_la_SOURCES = \
guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
-nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm
-
-libguile_pager_swig_la_LIBADD = $(_pager_swig_la_LIBADD)
-libguile_pager_swig_la_LDFLAGS = $(_pager_swig_la_LDFLAGS)
-libguile_pager_swig_la_CXXFLAGS = $(_pager_swig_la_CXXFLAGS)
+nobase_pager_swig_scm_DATA = \
+ gnuradio/pager_swig.scm \
+ gnuradio/pager_swig-primitive.scm
+libguile_pager_swig_la_LIBADD = \
+ $(STD_SWIG_LA_LIB_ADD) \
+ $(pager_swig_la_swig_libadd)
+libguile_pager_swig_la_LDFLAGS = \
+ $(STD_SWIG_LA_LD_FLAGS) \
+ $(pager_swig_la_swig_ldflags)
+libguile_pager_swig_la_CXXFLAGS = \
+ $(STD_SWIG_CXX_FLAGS) \
+ -I$(top_builddir) \
+ $(pager_swig_la_swig_cxxflags)
guile/pager_swig.cc: gnuradio/pager_swig.scm
gnuradio/pager_swig.scm: pager_swig.i
--
cgit
From cec8dfd8d0331566c93abb69ca02913011ad2a91 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 00:20:02 -0800
Subject: Confirm we can load guile pager module
---
gr-pager/swig/Makefile.am | 11 ++++++++++-
gr-pager/swig/gnuradio/pager.scm | 28 ++++++++++++++++++++++++++++
gr-pager/swig/pager.test | 36 ++++++++++++++++++++++++++++++++++++
gr-pager/swig/run_guile_tests.in | 14 ++++++++++++++
4 files changed, 88 insertions(+), 1 deletion(-)
create mode 100644 gr-pager/swig/gnuradio/pager.scm
create mode 100644 gr-pager/swig/pager.test
create mode 100644 gr-pager/swig/run_guile_tests.in
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am
index c59bdb0f2..fe22753e3 100644
--- a/gr-pager/swig/Makefile.am
+++ b/gr-pager/swig/Makefile.am
@@ -20,6 +20,9 @@
#
include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
AM_CPPFLAGS = \
-I$(top_srcdir)/gr-pager/lib \
@@ -27,6 +30,9 @@ AM_CPPFLAGS = \
$(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
+nobase_guile_DATA = \
+ gnuradio/pager.scm
+
##############################
# SWIG interface and library
TOP_SWIG_IFILES = \
@@ -51,10 +57,13 @@ pager_swig_swiginclude_headers = \
pager_flex_sync.i \
pager_slicer_fb.i
-include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
BUILT_SOURCES = $(swig_built_sources)
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+
+if GUILE
+TESTS += run_guile_tests
+endif
\ No newline at end of file
diff --git a/gr-pager/swig/gnuradio/pager.scm b/gr-pager/swig/gnuradio/pager.scm
new file mode 100644
index 000000000..99331b09c
--- /dev/null
+++ b/gr-pager/swig/gnuradio/pager.scm
@@ -0,0 +1,28 @@
+;;;
+;;; Copyright 2010 Free Software Foundation, Inc.
+;;;
+;;; This file is part of GNU Radio
+;;;
+;;; GNU Radio is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3, or (at your option)
+;;; any later version.
+;;;
+;;; GNU Radio is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see .
+;;;
+
+;;; Module that just re-exports the pager_swig module
+
+(define-module (gnuradio pager)
+ #:use-module (gnuradio export-safely)
+ #:use-module (gnuradio pager_swig)
+ #:duplicates (merge-generics replace check))
+
+(re-export-all '(gnuradio pager_swig))
+
diff --git a/gr-pager/swig/pager.test b/gr-pager/swig/pager.test
new file mode 100644
index 000000000..a5deb5810
--- /dev/null
+++ b/gr-pager/swig/pager.test
@@ -0,0 +1,36 @@
+;;; -*- Scheme -*-
+;;;
+;;; Copyright 2010 Free Software Foundation, Inc.
+;;;
+;;; This file is part of GNU Radio
+;;;
+;;; GNU Radio is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3, or (at your option)
+;;; any later version.
+;;;
+;;; GNU Radio is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see .
+;;;
+
+;;; If you're using Emacs's Scheme mode:
+;;; (put 'with-test-prefix 'scheme-indent-function 1)
+
+;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
+;;; See also the very end of the file, where the test-equal, test-eqv
+;;; and test-eq macros are defined.
+
+(define-module (test-module)
+ #:use-module (oop goops)
+ #:use-module (gnuradio core)
+ #:use-module (gnuradio test-suite lib)
+ #:duplicates (merge-generics replace check))
+
+;;; Confirm we can import the module...
+(use-modules (gnuradio pager))
+
diff --git a/gr-pager/swig/run_guile_tests.in b/gr-pager/swig/run_guile_tests.in
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-pager/swig/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. @top_builddir@/setup_guile_test_env
+
+# 1st argument is absolute path to hand coded guile source directory
+# 2nd argument is absolute path to component C++ shared library build directory
+# 3nd argument is absolute path to component SWIG build directory
+
+add_local_paths \
+ @srcdir@ \
+ @abs_builddir@ \
+ @abs_builddir@
+
+@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@
--
cgit
From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*
Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
gr-pager/swig/Makefile.am | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am
index fe22753e3..901f24ede 100644
--- a/gr-pager/swig/Makefile.am
+++ b/gr-pager/swig/Makefile.am
@@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.swig
TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
AM_CPPFLAGS = \
-I$(top_srcdir)/gr-pager/lib \
@@ -57,13 +58,6 @@ pager_swig_swiginclude_headers = \
pager_flex_sync.i \
pager_slicer_fb.i
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
-
if GUILE
TESTS += run_guile_tests
endif
\ No newline at end of file
--
cgit
From 401465831199fa8e29f36d604d9004020a657e72 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 18:35:20 -0800
Subject: Update .gitignore's
---
gr-pager/swig/.gitignore | 1 +
gr-pager/swig/gnuradio/.gitignore | 2 ++
2 files changed, 3 insertions(+)
create mode 100644 gr-pager/swig/gnuradio/.gitignore
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/.gitignore b/gr-pager/swig/.gitignore
index 6df28c365..3905ceb62 100644
--- a/gr-pager/swig/.gitignore
+++ b/gr-pager/swig/.gitignore
@@ -4,3 +4,4 @@
/pager_swig.cc
/*.pyc
/run_tests
+/run_guile_tests
diff --git a/gr-pager/swig/gnuradio/.gitignore b/gr-pager/swig/gnuradio/.gitignore
new file mode 100644
index 000000000..15034e70e
--- /dev/null
+++ b/gr-pager/swig/gnuradio/.gitignore
@@ -0,0 +1,2 @@
+pager_swig-primitive.scm
+pager_swig.scm
--
cgit
From b005e7d9f481ed39591d97ef697621368e6505c0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 19:08:21 -0800
Subject: Update .gitignore's
---
gr-pager/swig/.gitignore | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/.gitignore b/gr-pager/swig/.gitignore
index 3905ceb62..7e864f43f 100644
--- a/gr-pager/swig/.gitignore
+++ b/gr-pager/swig/.gitignore
@@ -5,3 +5,5 @@
/*.pyc
/run_tests
/run_guile_tests
+/guile
+/python
--
cgit
From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:30:54 -0800
Subject: Rename libguile- to libguile-gnuradio- to match guile library naming
convention.
The stuff in gnuradio-core ends up with funky names, but that could
be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc.
---
gr-pager/swig/pager_swig.i | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index 5561c26fc..b202242b0 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -37,7 +37,7 @@
#if SWIGGUILE
%scheme %{
-(load-extension "libguile-pager_swig" "scm_init_gnuradio_pager_swig_module")
+(load-extension "libguile-gnuradio-pager_swig" "scm_init_gnuradio_pager_swig_module")
%}
%goops %{
--
cgit
From 6df0423fe1880f5c33daa333604552ea68ac9593 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:34:24 -0800
Subject: Regenerated Makefile.swig.gen's
---
gr-pager/swig/Makefile.swig.gen | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 1b74c3be7..70d215384 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif # end of if python
if GUILE
pager_swig_scmlib_LTLIBRARIES = \
- libguile-pager_swig.la
-libguile_pager_swig_la_SOURCES = \
+ libguile-gnuradio-pager_swig.la
+libguile_gnuradio_pager_swig_la_SOURCES = \
guile/pager_swig.cc \
$(pager_swig_la_swig_sources)
nobase_pager_swig_scm_DATA = \
gnuradio/pager_swig.scm \
gnuradio/pager_swig-primitive.scm
-libguile_pager_swig_la_LIBADD = \
+libguile_gnuradio_pager_swig_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(pager_swig_la_swig_libadd)
-libguile_pager_swig_la_LDFLAGS = \
+libguile_gnuradio_pager_swig_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(pager_swig_la_swig_ldflags)
-libguile_pager_swig_la_CXXFLAGS = \
+libguile_gnuradio_pager_swig_la_CXXFLAGS = \
$(STD_SWIG_CXX_FLAGS) \
-I$(top_builddir) \
$(pager_swig_la_swig_cxxflags)
--
cgit
From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 10 Dec 2010 16:15:40 -0800
Subject: Use load-extension-global instead of load-extension
---
gr-pager/swig/pager_swig.i | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index b202242b0..2896fa368 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -37,7 +37,7 @@
#if SWIGGUILE
%scheme %{
-(load-extension "libguile-gnuradio-pager_swig" "scm_init_gnuradio_pager_swig_module")
+(load-extension-global "libguile-gnuradio-pager_swig" "scm_init_gnuradio_pager_swig_module")
%}
%goops %{
--
cgit
From fd8f86713d8f9de79850b9e7aabde7c453b7e890 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 22:56:47 -0800
Subject: Add missing .test files to tarball.
---
gr-pager/swig/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'gr-pager/swig')
diff --git a/gr-pager/swig/Makefile.am b/gr-pager/swig/Makefile.am
index 901f24ede..3d62c80f0 100644
--- a/gr-pager/swig/Makefile.am
+++ b/gr-pager/swig/Makefile.am
@@ -31,8 +31,13 @@ AM_CPPFLAGS = \
$(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
+if GUILE
nobase_guile_DATA = \
gnuradio/pager.scm
+endif
+
+noinst_GUILE = pager.test
+
##############################
# SWIG interface and library
--
cgit