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-msdd6000/src/Makefile.swig.gen | 218 ++++++++++++++++++++++++++++---------- 1 file changed, 163 insertions(+), 55 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index ced3979f7..0ae665129 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -33,21 +33,14 @@ ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. - msdd_pythondir_category ?= gnuradio/msdd msdd_pylibdir_category ?= $(msdd_pythondir_category) msdd_pythondir = $(pythondir)/$(msdd_pythondir_category) msdd_pylibdir = $(pyexecdir)/$(msdd_pylibdir_category) -msdd_rs_pythondir_category ?= gnuradio/msdd_rs -msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category) -msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category) -msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category) - ## SWIG headers are always installed into the same directory. msdd_swigincludedir = $(swigincludedir) -msdd_rs_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -70,7 +63,6 @@ msdd_rs_swigincludedir = $(swigincludedir) ## the SWIG-generated files will be removed from the distribution. STAMPS += $(DEPDIR)/msdd-generate-* -STAMPS += $(DEPDIR)/msdd_rs-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -80,40 +72,27 @@ 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 += msdd.py msdd_rs.py msdd.cc msdd_rs.cc +swig_built_sources += msdd.py msdd-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . msdd_swiginclude_HEADERS = \ - msdd.i \ - msdd_rs.i \ + msdd.i \ $(msdd_swiginclude_headers) msdd_pylib_LTLIBRARIES = \ _msdd.la -msdd_rs_pylib_LTLIBRARIES = \ - _msdd_rs.la - _msdd_la_SOURCES = \ - msdd.cc \ + msdd-python.cc \ $(msdd_la_swig_sources) -_msdd_rs_la_SOURCES = \ - msdd_rs.cc \ - $(msdd_la_swig_sources) - - _msdd_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -_msdd_rs_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(msdd_rs_la_swig_libadd) - _msdd_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) @@ -122,25 +101,13 @@ _msdd_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(msdd_la_swig_cxxflags) -_msdd_rs_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(msdd_rs_la_swig_ldflags) - -_msdd_rs_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(msdd_rs_la_swig_cxxflags) - msdd_python_PYTHON = \ - msdd.py \ + msdd.py \ $(msdd_python) -msdd_rs_python_PYTHON = \ - msdd_rs.py \ - $(msdd_rs_python) - ## Entry rule for running SWIG -msdd.h msdd.py msdd.cc: msdd.i +msdd.h msdd.py msdd-python.cc: msdd.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -192,11 +159,12 @@ msdd.h msdd.py msdd.cc: msdd.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/msdd-generate-stamp; \ + rm -f $(DEPDIR)/msdd-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-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 @@ -220,11 +188,27 @@ msdd.h msdd.py msdd.cc: msdd.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/msdd-generate-stamp; \ + test -f $(DEPDIR)/msdd-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/msdd-generate-stamp: +$(DEPDIR)/msdd-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ + -MD -MF $(DEPDIR)/msdd.Std \ + -module msdd -o msdd-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/msdd.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ + > $(DEPDIR)/msdd.Sd; \ + $(RM) $(DEPDIR)/msdd.Std; \ + $(MV) $(DEPDIR)/msdd.Sd $(DEPDIR)/msdd.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/msdd.S*; exit 1; \ + fi; + touch $(DEPDIR)/msdd-generate-guile-stamp + +$(DEPDIR)/msdd-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 @@ -235,7 +219,7 @@ $(DEPDIR)/msdd-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd.Std \ - -module msdd -o msdd.cc $(WHAT); then \ + -module msdd -o msdd-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ @@ -282,14 +266,124 @@ $(DEPDIR)/msdd-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/msdd-generate-stamp + touch $(DEPDIR)/msdd-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)/msdd.d@am__quote@ + +# -*- Makefile -*- +# +# Copyright 2009 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +# Makefile.swig.gen for msdd_rs.i + +## Default install locations for these files: +## +## Default location for the Python directory is: +## ${prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs +## Default location for the Python exec directory is: +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs +## +## The following can be overloaded to change the install location, but +## this has to be done in the including Makefile.am -before- +## Makefile.swig is included. + +msdd_rs_pythondir_category ?= gnuradio/msdd_rs +msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category) +msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category) +msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category) + +## SWIG headers are always installed into the same directory. + +msdd_rs_swigincludedir = $(swigincludedir) + +## This is a template file for a "generated" Makefile addition (in +## this case, "Makefile.swig.gen"). By including the top-level +## Makefile.swig, this file will be used to generate the SWIG +## dependencies. Assign the variable TOP_SWIG_FILES to be the list of +## SWIG .i files to generated wrappings for; there can be more than 1 +## so long as the names are unique (no sorting is done on the +## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i +## file will generate .cc, .py, and possibly .h files -- meaning that +## all of these files will have the same base name (that provided for +## the SWIG .i file). +## +## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the +## 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)/msdd_rs-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 . +swig_built_sources += msdd_rs.py msdd_rs-python.cc + +## Various SWIG variables. These can be overloaded in the including +## Makefile.am by setting the variable value there, then including +## Makefile.swig . + +msdd_rs_swiginclude_HEADERS = \ + msdd_rs.i \ + $(msdd_rs_swiginclude_headers) +msdd_rs_pylib_LTLIBRARIES = \ + _msdd_rs.la + +_msdd_rs_la_SOURCES = \ + msdd_rs-python.cc \ + $(msdd_rs_la_swig_sources) + +_msdd_rs_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(msdd_rs_la_swig_libadd) + +_msdd_rs_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(msdd_rs_la_swig_ldflags) + +_msdd_rs_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + $(msdd_rs_la_swig_cxxflags) +msdd_rs_python_PYTHON = \ + msdd_rs.py \ + $(msdd_rs_python) +## Entry rule for running SWIG -msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i +msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -316,7 +410,7 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i ## ## Once execution gets to here, it should always proceed no matter the ## state of a stamp (as discussed in link above). The -## $(DEPDIR)/msdd-generate stuff is used to allow for parallel +## $(DEPDIR)/msdd_rs-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. @@ -341,11 +435,12 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/msdd_rs-generate-stamp; \ + rm -f $(DEPDIR)/msdd_rs-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-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 @@ -369,11 +464,27 @@ msdd_rs.h msdd_rs.py msdd_rs.cc: msdd_rs.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/msdd_rs-generate-stamp; \ + test -f $(DEPDIR)/msdd_rs-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/msdd_rs-generate-stamp: +$(DEPDIR)/msdd_rs-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ + -MD -MF $(DEPDIR)/msdd_rs.Std \ + -module msdd_rs -o msdd_rs-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/msdd_rs.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ + > $(DEPDIR)/msdd_rs.Sd; \ + $(RM) $(DEPDIR)/msdd_rs.Std; \ + $(MV) $(DEPDIR)/msdd_rs.Sd $(DEPDIR)/msdd_rs.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \ + fi; + touch $(DEPDIR)/msdd_rs-generate-guile-stamp + +$(DEPDIR)/msdd_rs-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 @@ -384,7 +495,7 @@ $(DEPDIR)/msdd_rs-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs.Std \ - -module msdd_rs -o msdd_rs.cc $(WHAT); then \ + -module msdd_rs -o msdd_rs-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd_rs.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ @@ -431,14 +542,11 @@ $(DEPDIR)/msdd_rs-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/msdd_rs-generate-stamp + touch $(DEPDIR)/msdd_rs-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)/msdd.d@am__quote@ @am__include@ @am__quote@./$(DEPDIR)/msdd_rs.d@am__quote@ - -- 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-msdd6000/src/Makefile.swig.gen | 72 ++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 20 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 0ae665129..b77fa0a86 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/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 += msdd.py msdd-python.cc +swig_built_sources += msdd.py msdd_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 @@ msdd_swiginclude_HEADERS = \ $(msdd_swiginclude_headers) msdd_pylib_LTLIBRARIES = \ - _msdd.la + _msdd_python.la -_msdd_la_SOURCES = \ - msdd-python.cc \ +_msdd_python_la_SOURCES = \ + msdd_python.cc \ $(msdd_la_swig_sources) -_msdd_la_LIBADD = \ +_msdd_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -_msdd_la_LDFLAGS = \ +_msdd_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) -_msdd_la_CXXFLAGS = \ +_msdd_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(msdd_la_swig_cxxflags) @@ -105,9 +105,23 @@ msdd_python_PYTHON = \ msdd.py \ $(msdd_python) +if GUILE +msdd_pylib_LTLIBRARIES += _msdd_guile.la + +_msdd_guile_la_SOURCES = \ + msdd_guile.cc \ + $(msdd_la_swig_sources) + +# Guile can use the same flags as python does +_msdd_guile_la_LIBADD = $(_msdd_python_la_LIBADD) +_msdd_guile_la_LDFLAGS = $(_msdd_python_la_LDFLAGS) +_msdd_guile_la_CXXFLAGS = $(_msdd_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -msdd.h msdd.py msdd-python.cc: msdd.i +msdd.h msdd.py msdd_python.cc: msdd.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 @@ msdd.h msdd.py msdd-python.cc: msdd.i fi; $(DEPDIR)/msdd-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd.Std \ - -module msdd -o msdd-guile.cc $(WHAT); then \ + -module msdd -o msdd_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/msdd-generate-guile-stamp: $(RM) $(DEPDIR)/msdd.S*; exit 1; \ fi; touch $(DEPDIR)/msdd-generate-guile-stamp +endif $(DEPDIR)/msdd-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/msdd-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd.Std \ - -module msdd -o msdd-python.cc $(WHAT); then \ + -module msdd -o msdd_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ @@ -348,7 +364,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 += msdd_rs.py msdd_rs-python.cc +swig_built_sources += msdd_rs.py msdd_rs_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -359,21 +375,21 @@ msdd_rs_swiginclude_HEADERS = \ $(msdd_rs_swiginclude_headers) msdd_rs_pylib_LTLIBRARIES = \ - _msdd_rs.la + _msdd_rs_python.la -_msdd_rs_la_SOURCES = \ - msdd_rs-python.cc \ +_msdd_rs_python_la_SOURCES = \ + msdd_rs_python.cc \ $(msdd_rs_la_swig_sources) -_msdd_rs_la_LIBADD = \ +_msdd_rs_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) -_msdd_rs_la_LDFLAGS = \ +_msdd_rs_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_rs_la_swig_ldflags) -_msdd_rs_la_CXXFLAGS = \ +_msdd_rs_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(msdd_rs_la_swig_cxxflags) @@ -381,9 +397,23 @@ msdd_rs_python_PYTHON = \ msdd_rs.py \ $(msdd_rs_python) +if GUILE +msdd_rs_pylib_LTLIBRARIES += _msdd_rs_guile.la + +_msdd_rs_guile_la_SOURCES = \ + msdd_rs_guile.cc \ + $(msdd_rs_la_swig_sources) + +# Guile can use the same flags as python does +_msdd_rs_guile_la_LIBADD = $(_msdd_rs_python_la_LIBADD) +_msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_python_la_LDFLAGS) +_msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i +msdd_rs.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -469,9 +499,10 @@ msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i fi; $(DEPDIR)/msdd_rs-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs.Std \ - -module msdd_rs -o msdd_rs-guile.cc $(WHAT); then \ + -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd_rs.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ @@ -483,6 +514,7 @@ $(DEPDIR)/msdd_rs-generate-guile-stamp: $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \ fi; touch $(DEPDIR)/msdd_rs-generate-guile-stamp +endif $(DEPDIR)/msdd_rs-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -495,7 +527,7 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs.Std \ - -module msdd_rs -o msdd_rs-python.cc $(WHAT); then \ + -module msdd_rs -o msdd_rs_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd_rs.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.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-msdd6000/src/Makefile.swig.gen | 106 ++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 44 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index b77fa0a86..b1532da99 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -msdd.h msdd.py msdd_python.cc: msdd.i +msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.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 @@ msdd.h msdd.py msdd_python.cc: msdd.i $(DEPDIR)/msdd-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ - -MD -MF $(DEPDIR)/msdd.Std \ + -MD -MF $(DEPDIR)/msdd_guile.Std \ -module msdd -o msdd_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ - > $(DEPDIR)/msdd.Sd; \ - $(RM) $(DEPDIR)/msdd.Std; \ - $(MV) $(DEPDIR)/msdd.Sd $(DEPDIR)/msdd.Std; \ + $(RM) $(DEPDIR)/msdd_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_guile.Std \ + > $(DEPDIR)/msdd_guile.Sd; \ + $(RM) $(DEPDIR)/msdd_guile.Std; \ + $(MV) $(DEPDIR)/msdd_guile.Sd $(DEPDIR)/msdd_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/msdd.S*; exit 1; \ + $(RM) $(DEPDIR)/msdd_guile.S*; exit 1; \ fi; touch $(DEPDIR)/msdd-generate-guile-stamp + $(RM) $(DEPDIR)/msdd_guile.d + cp $(DEPDIR)/msdd_guile.Std $(DEPDIR)/msdd_guile.d + echo "" >> $(DEPDIR)/msdd_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d + $(RM) $(DEPDIR)/msdd_guile.Std + touch $(DEPDIR)/msdd-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@ endif $(DEPDIR)/msdd-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/msdd-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_swig_args) \ - -MD -MF $(DEPDIR)/msdd.Std \ + -MD -MF $(DEPDIR)/msdd_python.Std \ -module msdd -o msdd_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ - > $(DEPDIR)/msdd.Sd; \ - $(RM) $(DEPDIR)/msdd.Std; \ - $(MV) $(DEPDIR)/msdd.Sd $(DEPDIR)/msdd.Std; \ + $(RM) $(DEPDIR)/msdd_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_python.Std \ + > $(DEPDIR)/msdd_python.Sd; \ + $(RM) $(DEPDIR)/msdd_python.Std; \ + $(MV) $(DEPDIR)/msdd_python.Sd $(DEPDIR)/msdd_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/msdd.S*; exit 1; \ + $(RM) $(DEPDIR)/msdd_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/msdd-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/msdd.d + $(RM) $(DEPDIR)/msdd_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/msdd.Std $(DEPDIR)/msdd.d + cp $(DEPDIR)/msdd_python.Std $(DEPDIR)/msdd_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/msdd.d + echo "" >> $(DEPDIR)/msdd_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)/msdd.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/msdd.Std + $(RM) $(DEPDIR)/msdd_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -288,7 +297,7 @@ $(DEPDIR)/msdd-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)/msdd.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/msdd_python.d@am__quote@ # -*- Makefile -*- # @@ -413,7 +422,7 @@ endif # end of GUILE ## Entry rule for running SWIG -msdd_rs.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i +msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: msdd_rs.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -501,19 +510,28 @@ msdd_rs.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i $(DEPDIR)/msdd_rs-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ - -MD -MF $(DEPDIR)/msdd_rs.Std \ + -MD -MF $(DEPDIR)/msdd_rs_guile.Std \ -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_rs.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ - > $(DEPDIR)/msdd_rs.Sd; \ - $(RM) $(DEPDIR)/msdd_rs.Std; \ - $(MV) $(DEPDIR)/msdd_rs.Sd $(DEPDIR)/msdd_rs.Std; \ + $(RM) $(DEPDIR)/msdd_rs_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_guile.Std \ + > $(DEPDIR)/msdd_rs_guile.Sd; \ + $(RM) $(DEPDIR)/msdd_rs_guile.Std; \ + $(MV) $(DEPDIR)/msdd_rs_guile.Sd $(DEPDIR)/msdd_rs_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \ + $(RM) $(DEPDIR)/msdd_rs_guile.S*; exit 1; \ fi; touch $(DEPDIR)/msdd_rs-generate-guile-stamp + $(RM) $(DEPDIR)/msdd_rs_guile.d + cp $(DEPDIR)/msdd_rs_guile.Std $(DEPDIR)/msdd_rs_guile.d + echo "" >> $(DEPDIR)/msdd_rs_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_rs_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d + $(RM) $(DEPDIR)/msdd_rs_guile.Std + touch $(DEPDIR)/msdd_rs-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_guile.d@am__quote@ endif $(DEPDIR)/msdd_rs-generate-python-stamp: @@ -526,17 +544,17 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_rs_swig_args) \ - -MD -MF $(DEPDIR)/msdd_rs.Std \ + -MD -MF $(DEPDIR)/msdd_rs_python.Std \ -module msdd_rs -o msdd_rs_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_rs.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ - > $(DEPDIR)/msdd_rs.Sd; \ - $(RM) $(DEPDIR)/msdd_rs.Std; \ - $(MV) $(DEPDIR)/msdd_rs.Sd $(DEPDIR)/msdd_rs.Std; \ + $(RM) $(DEPDIR)/msdd_rs_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_python.Std \ + > $(DEPDIR)/msdd_rs_python.Sd; \ + $(RM) $(DEPDIR)/msdd_rs_python.Std; \ + $(MV) $(DEPDIR)/msdd_rs_python.Sd $(DEPDIR)/msdd_rs_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \ + $(RM) $(DEPDIR)/msdd_rs_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -548,27 +566,27 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/msdd_rs.d + $(RM) $(DEPDIR)/msdd_rs_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/msdd_rs.Std $(DEPDIR)/msdd_rs.d + cp $(DEPDIR)/msdd_rs_python.Std $(DEPDIR)/msdd_rs_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/msdd_rs.d + echo "" >> $(DEPDIR)/msdd_rs_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)/msdd_rs.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_rs_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/msdd_rs.Std + $(RM) $(DEPDIR)/msdd_rs_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -580,5 +598,5 @@ $(DEPDIR)/msdd_rs-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)/msdd_rs.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_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-msdd6000/src/Makefile.swig.gen | 108 +++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index b1532da99..460c81e88 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -206,33 +206,6 @@ msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i exit $$?; \ fi; -$(DEPDIR)/msdd-generate-guile-stamp: -if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ - -MD -MF $(DEPDIR)/msdd_guile.Std \ - -module msdd -o msdd_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_guile.Std \ - > $(DEPDIR)/msdd_guile.Sd; \ - $(RM) $(DEPDIR)/msdd_guile.Std; \ - $(MV) $(DEPDIR)/msdd_guile.Sd $(DEPDIR)/msdd_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/msdd-generate-guile-stamp - $(RM) $(DEPDIR)/msdd_guile.d - cp $(DEPDIR)/msdd_guile.Std $(DEPDIR)/msdd_guile.d - echo "" >> $(DEPDIR)/msdd_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d - $(RM) $(DEPDIR)/msdd_guile.Std - touch $(DEPDIR)/msdd-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@ -endif - $(DEPDIR)/msdd-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,6 +272,33 @@ $(DEPDIR)/msdd-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_python.d@am__quote@ +$(DEPDIR)/msdd-generate-guile-stamp: +if GUILE + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ + -MD -MF $(DEPDIR)/msdd_guile.Std \ + -module msdd -o msdd_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/msdd_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_guile.Std \ + > $(DEPDIR)/msdd_guile.Sd; \ + $(RM) $(DEPDIR)/msdd_guile.Std; \ + $(MV) $(DEPDIR)/msdd_guile.Sd $(DEPDIR)/msdd_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/msdd_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/msdd-generate-guile-stamp + $(RM) $(DEPDIR)/msdd_guile.d + cp $(DEPDIR)/msdd_guile.Std $(DEPDIR)/msdd_guile.d + echo "" >> $(DEPDIR)/msdd_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d + $(RM) $(DEPDIR)/msdd_guile.Std + touch $(DEPDIR)/msdd-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@ +endif + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -507,33 +507,6 @@ msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: exit $$?; \ fi; -$(DEPDIR)/msdd_rs-generate-guile-stamp: -if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ - -MD -MF $(DEPDIR)/msdd_rs_guile.Std \ - -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_rs_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_guile.Std \ - > $(DEPDIR)/msdd_rs_guile.Sd; \ - $(RM) $(DEPDIR)/msdd_rs_guile.Std; \ - $(MV) $(DEPDIR)/msdd_rs_guile.Sd $(DEPDIR)/msdd_rs_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_rs_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/msdd_rs-generate-guile-stamp - $(RM) $(DEPDIR)/msdd_rs_guile.d - cp $(DEPDIR)/msdd_rs_guile.Std $(DEPDIR)/msdd_rs_guile.d - echo "" >> $(DEPDIR)/msdd_rs_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_rs_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d - $(RM) $(DEPDIR)/msdd_rs_guile.Std - touch $(DEPDIR)/msdd_rs-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_guile.d@am__quote@ -endif - $(DEPDIR)/msdd_rs-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 @@ -600,3 +573,30 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_rs_python.d@am__quote@ +$(DEPDIR)/msdd_rs-generate-guile-stamp: +if GUILE + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ + -MD -MF $(DEPDIR)/msdd_rs_guile.Std \ + -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/msdd_rs_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_guile.Std \ + > $(DEPDIR)/msdd_rs_guile.Sd; \ + $(RM) $(DEPDIR)/msdd_rs_guile.Std; \ + $(MV) $(DEPDIR)/msdd_rs_guile.Sd $(DEPDIR)/msdd_rs_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/msdd_rs_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/msdd_rs-generate-guile-stamp + $(RM) $(DEPDIR)/msdd_rs_guile.d + cp $(DEPDIR)/msdd_rs_guile.Std $(DEPDIR)/msdd_rs_guile.d + echo "" >> $(DEPDIR)/msdd_rs_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_rs_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d + $(RM) $(DEPDIR)/msdd_rs_guile.Std + touch $(DEPDIR)/msdd_rs-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_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-msdd6000/src/Makefile.swig.gen | 102 ++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 14 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 460c81e88..50ba1ab38 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -38,6 +38,16 @@ msdd_pylibdir_category ?= $(msdd_pythondir_category) msdd_pythondir = $(pythondir)/$(msdd_pythondir_category) msdd_pylibdir = $(pyexecdir)/$(msdd_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. +msdd_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/msdd +# FIXME: determince whether these should be installed with gnuradio. +msdd_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. msdd_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += msdd.py msdd_python.cc +if GUILE +swig_built_sources += msdd.scm msdd_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 @@ msdd_python_PYTHON = \ $(msdd_python) if GUILE -msdd_pylib_LTLIBRARIES += _msdd_guile.la - +msdd_scmlib_LTLIBRARIES = _msdd_guile.la _msdd_guile_la_SOURCES = \ - msdd_guile.cc \ + msdd_guile.cc \ $(msdd_la_swig_sources) +msdd_scm_DATA = msdd.scm # Guile can use the same flags as python does _msdd_guile_la_LIBADD = $(_msdd_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i +# $(python_deps) $(guile_deps): msdd.i +msdd_python.h msdd.py msdd_python.cc: msdd.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 @@ msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-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 @@ msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i 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. +msdd_guile.h msdd.scm msdd_guile.cc: msdd.i +if GUILE + trap 'rm -rf $(DEPDIR)/msdd-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/msdd-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/msdd-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/msdd-generate-lock; \ + else \ + while test -d $(DEPDIR)/msdd-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/msdd-generate-guile-stamp; \ + exit $$?; \ + fi; +endif # end of GUILE + $(DEPDIR)/msdd-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)/msdd-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_python.d@am__quote@ -$(DEPDIR)/msdd-generate-guile-stamp: if GUILE +$(DEPDIR)/msdd-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) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd_guile.Std \ -module msdd -o msdd_guile.cc $(WHAT); then \ @@ -295,9 +328,13 @@ if GUILE awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d $(RM) $(DEPDIR)/msdd_guile.Std touch $(DEPDIR)/msdd-generate-guile-stamp +else + touch $(DEPDIR)/msdd-generate-guile-stamp +endif @am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@ -endif + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -339,6 +376,16 @@ msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category) msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category) msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_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. +msdd_rs_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/msdd_rs +# FIXME: determince whether these should be installed with gnuradio. +msdd_rs_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. msdd_rs_swigincludedir = $(swigincludedir) @@ -374,6 +421,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += msdd_rs.py msdd_rs_python.cc +if GUILE +swig_built_sources += msdd_rs.scm msdd_rs_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -407,11 +457,11 @@ msdd_rs_python_PYTHON = \ $(msdd_rs_python) if GUILE -msdd_rs_pylib_LTLIBRARIES += _msdd_rs_guile.la - +msdd_rs_scmlib_LTLIBRARIES = _msdd_rs_guile.la _msdd_rs_guile_la_SOURCES = \ - msdd_rs_guile.cc \ + msdd_rs_guile.cc \ $(msdd_rs_la_swig_sources) +msdd_rs_scm_DATA = msdd_rs.scm # Guile can use the same flags as python does _msdd_rs_guile_la_LIBADD = $(_msdd_rs_python_la_LIBADD) @@ -422,7 +472,8 @@ endif # end of GUILE ## Entry rule for running SWIG -msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: msdd_rs.i +# $(python_deps) $(guile_deps): msdd_rs.i +msdd_rs_python.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -479,7 +530,6 @@ msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-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 @@ -507,6 +557,24 @@ msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: 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. +msdd_rs_guile.h msdd_rs.scm msdd_rs_guile.cc: msdd_rs.i +if GUILE + trap 'rm -rf $(DEPDIR)/msdd_rs-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/msdd_rs-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/msdd_rs-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/msdd_rs-generate-lock; \ + else \ + while test -d $(DEPDIR)/msdd_rs-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/msdd_rs-generate-guile-stamp; \ + exit $$?; \ + fi; +endif # end of GUILE + $(DEPDIR)/msdd_rs-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 @@ -573,8 +641,10 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_rs_python.d@am__quote@ -$(DEPDIR)/msdd_rs-generate-guile-stamp: if GUILE +$(DEPDIR)/msdd_rs-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) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs_guile.Std \ -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ @@ -596,7 +666,11 @@ if GUILE awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d $(RM) $(DEPDIR)/msdd_rs_guile.Std touch $(DEPDIR)/msdd_rs-generate-guile-stamp +else + touch $(DEPDIR)/msdd_rs-generate-guile-stamp +endif @am__include@ @am__quote@./$(DEPDIR)/msdd_rs_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-msdd6000/src/Makefile.swig.gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 50ba1ab38..a2052e754 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -303,8 +303,8 @@ $(DEPDIR)/msdd-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_python.d@am__quote@ -if GUILE $(DEPDIR)/msdd-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) $(msdd_swig_args) \ @@ -641,8 +641,8 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/msdd_rs_python.d@am__quote@ -if GUILE $(DEPDIR)/msdd_rs-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) $(msdd_rs_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-msdd6000/src/Makefile.swig.gen | 482 ++++---------------------------------- 1 file changed, 50 insertions(+), 432 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index a2052e754..557bff515 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/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 += msdd.py msdd_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 += msdd.py if GUILE -swig_built_sources += msdd.scm msdd_guile.cc +swig_built_sources += msdd.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -96,245 +98,52 @@ msdd_swiginclude_HEADERS = \ $(msdd_swiginclude_headers) msdd_pylib_LTLIBRARIES = \ - _msdd_python.la + _msdd.la -_msdd_python_la_SOURCES = \ - msdd_python.cc \ +_msdd_la_SOURCES = \ + python/msdd.cc \ $(msdd_la_swig_sources) -_msdd_python_la_LIBADD = \ +_msdd_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -_msdd_python_la_LDFLAGS = \ +# _msdd_la_DEPENDENCIES = python/msdd.lo + +_msdd_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) -_msdd_python_la_CXXFLAGS = \ +_msdd_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(msdd_la_swig_cxxflags) msdd_python_PYTHON = \ msdd.py \ - $(msdd_python) + $(msdd) if GUILE -msdd_scmlib_LTLIBRARIES = _msdd_guile.la -_msdd_guile_la_SOURCES = \ - msdd_guile.cc \ +msdd_scmlib_LTLIBRARIES = msdd_guile.la +msdd_guile_la_SOURCES = \ + guile/msdd.cc \ $(msdd_la_swig_sources) msdd_scm_DATA = msdd.scm # Guile can use the same flags as python does -_msdd_guile_la_LIBADD = $(_msdd_python_la_LIBADD) -_msdd_guile_la_LDFLAGS = $(_msdd_python_la_LDFLAGS) -_msdd_guile_la_CXXFLAGS = $(_msdd_python_la_CXXFLAGS) - -endif # end of GUILE +msdd_guile_la_LIBADD = $(_msdd_la_LIBADD) +msdd_guile_la_LDFLAGS = $(_msdd_la_LDFLAGS) +msdd_guile_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) -## Entry rule for running SWIG - -# $(python_deps) $(guile_deps): msdd.i -msdd_python.h msdd.py msdd_python.cc: msdd.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)/msdd-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)/msdd-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)/msdd-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)/msdd-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-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)/msdd-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)/msdd-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)/msdd-generate-python-stamp; \ - exit $$?; \ - fi; +guile/msdd.lo: msdd.lo +msdd.scm: msdd.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. -msdd_guile.h msdd.scm msdd_guile.cc: msdd.i -if GUILE - trap 'rm -rf $(DEPDIR)/msdd-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/msdd-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/msdd-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/msdd-generate-lock; \ - else \ - while test -d $(DEPDIR)/msdd-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/msdd-generate-guile-stamp; \ - exit $$?; \ - fi; endif # end of GUILE -$(DEPDIR)/msdd-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) $(msdd_swig_args) \ - -MD -MF $(DEPDIR)/msdd_python.Std \ - -module msdd -o msdd_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_python.Std \ - > $(DEPDIR)/msdd_python.Sd; \ - $(RM) $(DEPDIR)/msdd_python.Std; \ - $(MV) $(DEPDIR)/msdd_python.Sd $(DEPDIR)/msdd_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_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)/msdd_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/msdd_python.Std $(DEPDIR)/msdd_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/msdd_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)/msdd_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/msdd_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)/msdd-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)/msdd_python.d@am__quote@ - -$(DEPDIR)/msdd-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) $(msdd_swig_args) \ - -MD -MF $(DEPDIR)/msdd_guile.Std \ - -module msdd -o msdd_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_guile.Std \ - > $(DEPDIR)/msdd_guile.Sd; \ - $(RM) $(DEPDIR)/msdd_guile.Std; \ - $(MV) $(DEPDIR)/msdd_guile.Sd $(DEPDIR)/msdd_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/msdd-generate-guile-stamp - $(RM) $(DEPDIR)/msdd_guile.d - cp $(DEPDIR)/msdd_guile.Std $(DEPDIR)/msdd_guile.d - echo "" >> $(DEPDIR)/msdd_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d - $(RM) $(DEPDIR)/msdd_guile.Std - touch $(DEPDIR)/msdd-generate-guile-stamp -else - touch $(DEPDIR)/msdd-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@ +python/msdd.lo: +msdd.lo: msdd.py msdd.scm +msdd.py: msdd.i -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -420,9 +229,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 += msdd_rs.py msdd_rs_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 += msdd_rs.py if GUILE -swig_built_sources += msdd_rs.scm msdd_rs_guile.cc +swig_built_sources += msdd_rs.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -434,243 +245,50 @@ msdd_rs_swiginclude_HEADERS = \ $(msdd_rs_swiginclude_headers) msdd_rs_pylib_LTLIBRARIES = \ - _msdd_rs_python.la + _msdd_rs.la -_msdd_rs_python_la_SOURCES = \ - msdd_rs_python.cc \ +_msdd_rs_la_SOURCES = \ + python/msdd_rs.cc \ $(msdd_rs_la_swig_sources) -_msdd_rs_python_la_LIBADD = \ +_msdd_rs_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) -_msdd_rs_python_la_LDFLAGS = \ +# _msdd_rs_la_DEPENDENCIES = python/msdd_rs.lo + +_msdd_rs_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_rs_la_swig_ldflags) -_msdd_rs_python_la_CXXFLAGS = \ +_msdd_rs_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(msdd_rs_la_swig_cxxflags) msdd_rs_python_PYTHON = \ msdd_rs.py \ - $(msdd_rs_python) + $(msdd_rs) if GUILE -msdd_rs_scmlib_LTLIBRARIES = _msdd_rs_guile.la -_msdd_rs_guile_la_SOURCES = \ - msdd_rs_guile.cc \ +msdd_rs_scmlib_LTLIBRARIES = msdd_rs_guile.la +msdd_rs_guile_la_SOURCES = \ + guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) msdd_rs_scm_DATA = msdd_rs.scm # Guile can use the same flags as python does -_msdd_rs_guile_la_LIBADD = $(_msdd_rs_python_la_LIBADD) -_msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_python_la_LDFLAGS) -_msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_python_la_CXXFLAGS) - -endif # end of GUILE +msdd_rs_guile_la_LIBADD = $(_msdd_rs_la_LIBADD) +msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) +msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) -## Entry rule for running SWIG - -# $(python_deps) $(guile_deps): msdd_rs.i -msdd_rs_python.h msdd_rs.py msdd_rs_python.cc: msdd_rs.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)/msdd_rs-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)/msdd_rs-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)/msdd_rs-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)/msdd_rs-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-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)/msdd_rs-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)/msdd_rs-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)/msdd_rs-generate-python-stamp; \ - exit $$?; \ - fi; +guile/msdd_rs.lo: msdd_rs.lo +msdd_rs.scm: msdd_rs.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. -msdd_rs_guile.h msdd_rs.scm msdd_rs_guile.cc: msdd_rs.i -if GUILE - trap 'rm -rf $(DEPDIR)/msdd_rs-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/msdd_rs-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/msdd_rs-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/msdd_rs-generate-lock; \ - else \ - while test -d $(DEPDIR)/msdd_rs-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/msdd_rs-generate-guile-stamp; \ - exit $$?; \ - fi; endif # end of GUILE -$(DEPDIR)/msdd_rs-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) $(msdd_rs_swig_args) \ - -MD -MF $(DEPDIR)/msdd_rs_python.Std \ - -module msdd_rs -o msdd_rs_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_rs_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_python.Std \ - > $(DEPDIR)/msdd_rs_python.Sd; \ - $(RM) $(DEPDIR)/msdd_rs_python.Std; \ - $(MV) $(DEPDIR)/msdd_rs_python.Sd $(DEPDIR)/msdd_rs_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_rs_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)/msdd_rs_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/msdd_rs_python.Std $(DEPDIR)/msdd_rs_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/msdd_rs_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)/msdd_rs_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/msdd_rs_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)/msdd_rs-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)/msdd_rs_python.d@am__quote@ - -$(DEPDIR)/msdd_rs-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) $(msdd_rs_swig_args) \ - -MD -MF $(DEPDIR)/msdd_rs_guile.Std \ - -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/msdd_rs_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs_guile.Std \ - > $(DEPDIR)/msdd_rs_guile.Sd; \ - $(RM) $(DEPDIR)/msdd_rs_guile.Std; \ - $(MV) $(DEPDIR)/msdd_rs_guile.Sd $(DEPDIR)/msdd_rs_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/msdd_rs_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/msdd_rs-generate-guile-stamp - $(RM) $(DEPDIR)/msdd_rs_guile.d - cp $(DEPDIR)/msdd_rs_guile.Std $(DEPDIR)/msdd_rs_guile.d - echo "" >> $(DEPDIR)/msdd_rs_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/msdd_rs_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d - $(RM) $(DEPDIR)/msdd_rs_guile.Std - touch $(DEPDIR)/msdd_rs-generate-guile-stamp -else - touch $(DEPDIR)/msdd_rs-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_guile.d@am__quote@ +python/msdd_rs.lo: +msdd_rs.lo: msdd_rs.py msdd_rs.scm +msdd_rs.py: msdd_rs.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-msdd6000/src/Makefile.swig.gen | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 557bff515..c62140a08 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -41,12 +41,12 @@ msdd_pylibdir = $(pyexecdir)/$(msdd_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. -msdd_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +msdd_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd # FIXME: determince whether these should be installed with gnuradio. -msdd_scmdir = @GUILE_PKDATADIR@/gnuradio +msdd_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -144,6 +144,7 @@ python/msdd.lo: msdd.lo: msdd.py msdd.scm msdd.py: msdd.i +-include python/msdd.d # -*- Makefile -*- # @@ -188,12 +189,12 @@ msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_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. -msdd_rs_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +msdd_rs_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd_rs # FIXME: determince whether these should be installed with gnuradio. -msdd_rs_scmdir = @GUILE_PKDATADIR@/gnuradio +msdd_rs_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -291,4 +292,5 @@ python/msdd_rs.lo: msdd_rs.lo: msdd_rs.py msdd_rs.scm msdd_rs.py: msdd_rs.i +-include python/msdd_rs.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-msdd6000/src/Makefile.swig.gen | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index c62140a08..c3a341eca 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -41,7 +41,7 @@ msdd_pylibdir = $(pyexecdir)/$(msdd_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. -msdd_scmlibdir = $(libdir)/guile/gnuradio +msdd_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd @@ -124,16 +124,16 @@ msdd_python_PYTHON = \ $(msdd) if GUILE -msdd_scmlib_LTLIBRARIES = msdd_guile.la -msdd_guile_la_SOURCES = \ +msdd_scmlib_LTLIBRARIES = libguile-msdd.la +libguile_msdd_la_SOURCES = \ guile/msdd.cc \ $(msdd_la_swig_sources) msdd_scm_DATA = msdd.scm # Guile can use the same flags as python does -msdd_guile_la_LIBADD = $(_msdd_la_LIBADD) -msdd_guile_la_LDFLAGS = $(_msdd_la_LDFLAGS) -msdd_guile_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) +libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD) +libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS) +libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) guile/msdd.lo: msdd.lo msdd.scm: msdd.i @@ -189,7 +189,7 @@ msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_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. -msdd_rs_scmlibdir = $(libdir)/guile/gnuradio +msdd_rs_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd_rs @@ -272,16 +272,16 @@ msdd_rs_python_PYTHON = \ $(msdd_rs) if GUILE -msdd_rs_scmlib_LTLIBRARIES = msdd_rs_guile.la -msdd_rs_guile_la_SOURCES = \ +msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la +libguile_msdd_rs_la_SOURCES = \ guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) msdd_rs_scm_DATA = msdd_rs.scm # Guile can use the same flags as python does -msdd_rs_guile_la_LIBADD = $(_msdd_rs_la_LIBADD) -msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) -msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) +libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD) +libguile_msdd_rs_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) +libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) guile/msdd_rs.lo: msdd_rs.lo msdd_rs.scm: msdd_rs.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-msdd6000/src/Makefile.swig.gen | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index c3a341eca..43d0e69ae 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -46,7 +46,7 @@ msdd_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd # FIXME: determince whether these should be installed with gnuradio. -msdd_scmdir = $(guiledir)/gnuradio +msdd_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -128,7 +128,7 @@ msdd_scmlib_LTLIBRARIES = libguile-msdd.la libguile_msdd_la_SOURCES = \ guile/msdd.cc \ $(msdd_la_swig_sources) -msdd_scm_DATA = msdd.scm +nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm # Guile can use the same flags as python does libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD) @@ -137,6 +137,9 @@ libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) guile/msdd.lo: msdd.lo msdd.scm: msdd.i +gnuradio/msdd-primitive.scm: msdd.scm + +-include guile/msdd.d endif # end of GUILE @@ -194,7 +197,7 @@ msdd_rs_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/msdd_rs # FIXME: determince whether these should be installed with gnuradio. -msdd_rs_scmdir = $(guiledir)/gnuradio +msdd_rs_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -276,7 +279,7 @@ msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la libguile_msdd_rs_la_SOURCES = \ guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) -msdd_rs_scm_DATA = msdd_rs.scm +nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-primitive.scm # Guile can use the same flags as python does libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD) @@ -285,6 +288,9 @@ libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) guile/msdd_rs.lo: msdd_rs.lo msdd_rs.scm: msdd_rs.i +gnuradio/msdd_rs-primitive.scm: msdd_rs.scm + +-include guile/msdd_rs.d endif # end of GUILE -- 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-msdd6000/src/Makefile.swig.gen | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 43d0e69ae..ba3850cd8 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/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 += msdd.py -if GUILE -swig_built_sources += msdd.scm -endif +# swig_built_sources += msdd.py +# if GUILE +# swig_built_sources += gnuradio/msdd.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_msdd_la_LIBADD = $(_msdd_la_LIBADD) libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS) libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) -guile/msdd.lo: msdd.lo -msdd.scm: msdd.i -gnuradio/msdd-primitive.scm: msdd.scm +guile/msdd.cc: gnuradio/msdd.scm +gnuradio/msdd.scm: msdd.i +gnuradio/msdd-primitive.scm: gnuradio/msdd.scm -include guile/msdd.d endif # end of GUILE -python/msdd.lo: msdd.lo: msdd.py msdd.scm msdd.py: msdd.i @@ -235,10 +234,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 += msdd_rs.py -if GUILE -swig_built_sources += msdd_rs.scm -endif +# swig_built_sources += msdd_rs.py +# if GUILE +# swig_built_sources += gnuradio/msdd_rs.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -286,15 +285,14 @@ libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD) libguile_msdd_rs_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) -guile/msdd_rs.lo: msdd_rs.lo -msdd_rs.scm: msdd_rs.i -gnuradio/msdd_rs-primitive.scm: msdd_rs.scm +guile/msdd_rs.cc: gnuradio/msdd_rs.scm +gnuradio/msdd_rs.scm: msdd_rs.i +gnuradio/msdd_rs-primitive.scm: gnuradio/msdd_rs.scm -include guile/msdd_rs.d endif # end of GUILE -python/msdd_rs.lo: msdd_rs.lo: msdd_rs.py msdd_rs.scm msdd_rs.py: msdd_rs.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-msdd6000/src/Makefile.swig.gen | 74 +++++++++++---------------------------- 1 file changed, 20 insertions(+), 54 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index ba3850cd8..7f0d484b9 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -67,28 +67,10 @@ msdd_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)/msdd-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 += msdd.py -# if GUILE -# swig_built_sources += gnuradio/msdd.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 @@ _msdd_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -# _msdd_la_DEPENDENCIES = python/msdd.lo - _msdd_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) @@ -123,14 +103,20 @@ msdd_python_PYTHON = \ msdd.py \ $(msdd) +python/msdd.cc: msdd.py +msdd.py: msdd.i + +# Include the python dependencies for this file +-include python/msdd.d +# end of PYTHON + if GUILE msdd_scmlib_LTLIBRARIES = libguile-msdd.la -libguile_msdd_la_SOURCES = \ - guile/msdd.cc \ +libguile_msdd_la_SOURCES = \ + guile/msdd.cc \ $(msdd_la_swig_sources) nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm -# Guile can use the same flags as python does libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD) libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS) libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) @@ -139,14 +125,11 @@ guile/msdd.cc: gnuradio/msdd.scm gnuradio/msdd.scm: msdd.i gnuradio/msdd-primitive.scm: gnuradio/msdd.scm +# Include the guile dependencies for this file -include guile/msdd.d endif # end of GUILE -msdd.lo: msdd.py msdd.scm -msdd.py: msdd.i - --include python/msdd.d # -*- Makefile -*- # @@ -217,28 +200,10 @@ msdd_rs_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)/msdd_rs-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 += msdd_rs.py -# if GUILE -# swig_built_sources += gnuradio/msdd_rs.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -258,8 +223,6 @@ _msdd_rs_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) -# _msdd_rs_la_DEPENDENCIES = python/msdd_rs.lo - _msdd_rs_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_rs_la_swig_ldflags) @@ -273,14 +236,20 @@ msdd_rs_python_PYTHON = \ msdd_rs.py \ $(msdd_rs) +python/msdd_rs.cc: msdd_rs.py +msdd_rs.py: msdd_rs.i + +# Include the python dependencies for this file +-include python/msdd_rs.d +# end of PYTHON + if GUILE msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la -libguile_msdd_rs_la_SOURCES = \ - guile/msdd_rs.cc \ +libguile_msdd_rs_la_SOURCES = \ + guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-primitive.scm -# Guile can use the same flags as python does libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD) libguile_msdd_rs_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) @@ -289,12 +258,9 @@ guile/msdd_rs.cc: gnuradio/msdd_rs.scm gnuradio/msdd_rs.scm: msdd_rs.i gnuradio/msdd_rs-primitive.scm: gnuradio/msdd_rs.scm +# Include the guile dependencies for this file -include guile/msdd_rs.d endif # end of GUILE -msdd_rs.lo: msdd_rs.py msdd_rs.scm -msdd_rs.py: msdd_rs.i - --include python/msdd_rs.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-msdd6000/src/Makefile.swig.gen | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 7f0d484b9..e3fd6b281 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -112,8 +112,8 @@ msdd.py: msdd.i if GUILE msdd_scmlib_LTLIBRARIES = libguile-msdd.la -libguile_msdd_la_SOURCES = \ - guile/msdd.cc \ +libguile_msdd_la_SOURCES = \ + guile/msdd.cc \ $(msdd_la_swig_sources) nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm @@ -245,8 +245,8 @@ msdd_rs.py: msdd_rs.i if GUILE msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la -libguile_msdd_rs_la_SOURCES = \ - guile/msdd_rs.cc \ +libguile_msdd_rs_la_SOURCES = \ + guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-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-msdd6000/src/Makefile.swig.gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index e3fd6b281..c76587567 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -101,7 +101,7 @@ _msdd_la_CXXFLAGS = \ msdd_python_PYTHON = \ msdd.py \ - $(msdd) + $(msdd_python) python/msdd.cc: msdd.py msdd.py: msdd.i @@ -234,7 +234,7 @@ _msdd_rs_la_CXXFLAGS = \ msdd_rs_python_PYTHON = \ msdd_rs.py \ - $(msdd_rs) + $(msdd_rs_python) python/msdd_rs.cc: msdd_rs.py msdd_rs.py: msdd_rs.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-msdd6000/src/Makefile.swig.gen | 68 ++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 22 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index c76587567..1c7da3f6e 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -79,6 +79,7 @@ msdd_swiginclude_HEADERS = \ msdd.i \ $(msdd_swiginclude_headers) +if PYTHON msdd_pylib_LTLIBRARIES = \ _msdd.la @@ -86,6 +87,10 @@ _msdd_la_SOURCES = \ python/msdd.cc \ $(msdd_la_swig_sources) +msdd_python_PYTHON = \ + msdd.py \ + $(msdd_python) + _msdd_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) @@ -99,27 +104,34 @@ _msdd_la_CXXFLAGS = \ -I$(top_builddir) \ $(msdd_la_swig_cxxflags) -msdd_python_PYTHON = \ - msdd.py \ - $(msdd_python) - python/msdd.cc: msdd.py msdd.py: msdd.i # Include the python dependencies for this file -include python/msdd.d -# end of PYTHON + +endif # end of if python if GUILE -msdd_scmlib_LTLIBRARIES = libguile-msdd.la + +msdd_scmlib_LTLIBRARIES = \ + libguile-msdd.la libguile_msdd_la_SOURCES = \ guile/msdd.cc \ $(msdd_la_swig_sources) -nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm - -libguile_msdd_la_LIBADD = $(_msdd_la_LIBADD) -libguile_msdd_la_LDFLAGS = $(_msdd_la_LDFLAGS) -libguile_msdd_la_CXXFLAGS = $(_msdd_la_CXXFLAGS) +nobase_msdd_scm_DATA = \ + gnuradio/msdd.scm \ + gnuradio/msdd-primitive.scm +libguile_msdd_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(msdd_la_swig_libadd) +libguile_msdd_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(msdd_la_swig_ldflags) +libguile_msdd_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(msdd_la_swig_cxxflags) guile/msdd.cc: gnuradio/msdd.scm gnuradio/msdd.scm: msdd.i @@ -212,6 +224,7 @@ msdd_rs_swiginclude_HEADERS = \ msdd_rs.i \ $(msdd_rs_swiginclude_headers) +if PYTHON msdd_rs_pylib_LTLIBRARIES = \ _msdd_rs.la @@ -219,6 +232,10 @@ _msdd_rs_la_SOURCES = \ python/msdd_rs.cc \ $(msdd_rs_la_swig_sources) +msdd_rs_python_PYTHON = \ + msdd_rs.py \ + $(msdd_rs_python) + _msdd_rs_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) @@ -232,27 +249,34 @@ _msdd_rs_la_CXXFLAGS = \ -I$(top_builddir) \ $(msdd_rs_la_swig_cxxflags) -msdd_rs_python_PYTHON = \ - msdd_rs.py \ - $(msdd_rs_python) - python/msdd_rs.cc: msdd_rs.py msdd_rs.py: msdd_rs.i # Include the python dependencies for this file -include python/msdd_rs.d -# end of PYTHON + +endif # end of if python if GUILE -msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la + +msdd_rs_scmlib_LTLIBRARIES = \ + libguile-msdd_rs.la libguile_msdd_rs_la_SOURCES = \ guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) -nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-primitive.scm - -libguile_msdd_rs_la_LIBADD = $(_msdd_rs_la_LIBADD) -libguile_msdd_rs_la_LDFLAGS = $(_msdd_rs_la_LDFLAGS) -libguile_msdd_rs_la_CXXFLAGS = $(_msdd_rs_la_CXXFLAGS) +nobase_msdd_rs_scm_DATA = \ + gnuradio/msdd_rs.scm \ + gnuradio/msdd_rs-primitive.scm +libguile_msdd_rs_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(msdd_rs_la_swig_libadd) +libguile_msdd_rs_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(msdd_rs_la_swig_ldflags) +libguile_msdd_rs_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(msdd_rs_la_swig_cxxflags) guile/msdd_rs.cc: gnuradio/msdd_rs.scm gnuradio/msdd_rs.scm: msdd_rs.i -- 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-msdd6000/src/Makefile.swig.gen | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gr-msdd6000/src/Makefile.swig.gen') diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 1c7da3f6e..dbf137334 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -115,20 +115,20 @@ endif # end of if python if GUILE msdd_scmlib_LTLIBRARIES = \ - libguile-msdd.la -libguile_msdd_la_SOURCES = \ + libguile-gnuradio-msdd.la +libguile_gnuradio_msdd_la_SOURCES = \ guile/msdd.cc \ $(msdd_la_swig_sources) nobase_msdd_scm_DATA = \ gnuradio/msdd.scm \ gnuradio/msdd-primitive.scm -libguile_msdd_la_LIBADD = \ +libguile_gnuradio_msdd_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -libguile_msdd_la_LDFLAGS = \ +libguile_gnuradio_msdd_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) -libguile_msdd_la_CXXFLAGS = \ +libguile_gnuradio_msdd_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(msdd_la_swig_cxxflags) @@ -260,20 +260,20 @@ endif # end of if python if GUILE msdd_rs_scmlib_LTLIBRARIES = \ - libguile-msdd_rs.la -libguile_msdd_rs_la_SOURCES = \ + libguile-gnuradio-msdd_rs.la +libguile_gnuradio_msdd_rs_la_SOURCES = \ guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) nobase_msdd_rs_scm_DATA = \ gnuradio/msdd_rs.scm \ gnuradio/msdd_rs-primitive.scm -libguile_msdd_rs_la_LIBADD = \ +libguile_gnuradio_msdd_rs_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) -libguile_msdd_rs_la_LDFLAGS = \ +libguile_gnuradio_msdd_rs_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_rs_la_swig_ldflags) -libguile_msdd_rs_la_CXXFLAGS = \ +libguile_gnuradio_msdd_rs_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(msdd_rs_la_swig_cxxflags) -- cgit