diff options
-rw-r--r-- | gr-atsc/src/lib/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-audio-alsa/src/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-audio-oss/src/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-cvsd-vocoder/src/lib/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-gcell/src/Makefile.swig.gen | 55 | ||||
-rw-r--r-- | gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-msdd6000/src/Makefile.swig.gen | 106 | ||||
-rw-r--r-- | gr-noaa/swig/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-pager/swig/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-qtgui/src/lib/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-radio-astronomy/src/lib/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-usrp2/src/Makefile.swig.gen | 53 | ||||
-rw-r--r-- | gr-video-sdl/src/Makefile.swig.gen | 53 |
13 files changed, 436 insertions, 308 deletions
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen index 4ecd70cf2..20c82275c 100644 --- a/gr-atsc/src/lib/Makefile.swig.gen +++ b/gr-atsc/src/lib/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -atsc.h atsc.py atsc_python.cc: atsc.i +atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.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 @@ atsc.h atsc.py atsc_python.cc: atsc.i $(DEPDIR)/atsc-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \ - -MD -MF $(DEPDIR)/atsc.Std \ + -MD -MF $(DEPDIR)/atsc_guile.Std \ -module atsc -o atsc_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/atsc.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \ - > $(DEPDIR)/atsc.Sd; \ - $(RM) $(DEPDIR)/atsc.Std; \ - $(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \ + $(RM) $(DEPDIR)/atsc_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_guile.Std \ + > $(DEPDIR)/atsc_guile.Sd; \ + $(RM) $(DEPDIR)/atsc_guile.Std; \ + $(MV) $(DEPDIR)/atsc_guile.Sd $(DEPDIR)/atsc_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/atsc.S*; exit 1; \ + $(RM) $(DEPDIR)/atsc_guile.S*; exit 1; \ fi; touch $(DEPDIR)/atsc-generate-guile-stamp + $(RM) $(DEPDIR)/atsc_guile.d + cp $(DEPDIR)/atsc_guile.Std $(DEPDIR)/atsc_guile.d + echo "" >> $(DEPDIR)/atsc_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d + $(RM) $(DEPDIR)/atsc_guile.Std + touch $(DEPDIR)/atsc-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/atsc_guile.d@am__quote@ endif $(DEPDIR)/atsc-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/atsc-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \ - -MD -MF $(DEPDIR)/atsc.Std \ + -MD -MF $(DEPDIR)/atsc_python.Std \ -module atsc -o atsc_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/atsc.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \ - > $(DEPDIR)/atsc.Sd; \ - $(RM) $(DEPDIR)/atsc.Std; \ - $(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \ + $(RM) $(DEPDIR)/atsc_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_python.Std \ + > $(DEPDIR)/atsc_python.Sd; \ + $(RM) $(DEPDIR)/atsc_python.Std; \ + $(MV) $(DEPDIR)/atsc_python.Sd $(DEPDIR)/atsc_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/atsc.S*; exit 1; \ + $(RM) $(DEPDIR)/atsc_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/atsc-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/atsc.d + $(RM) $(DEPDIR)/atsc_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/atsc.Std $(DEPDIR)/atsc.d + cp $(DEPDIR)/atsc_python.Std $(DEPDIR)/atsc_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/atsc.d + echo "" >> $(DEPDIR)/atsc_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)/atsc.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/atsc.Std + $(RM) $(DEPDIR)/atsc_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)/atsc-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)/atsc.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/atsc_python.d@am__quote@ diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen index cede38fd0..8b9075cbc 100644 --- a/gr-audio-alsa/src/Makefile.swig.gen +++ b/gr-audio-alsa/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -audio_alsa.h audio_alsa.py audio_alsa_python.cc: audio_alsa.i +audio_alsa_python.h audio_alsa.py audio_alsa_python.cc audio_alsa_guile.cc audio_alsa_guile.h: audio_alsa.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 @@ audio_alsa.h audio_alsa.py audio_alsa_python.cc: audio_alsa.i $(DEPDIR)/audio_alsa-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_alsa_swig_args) \ - -MD -MF $(DEPDIR)/audio_alsa.Std \ + -MD -MF $(DEPDIR)/audio_alsa_guile.Std \ -module audio_alsa -o audio_alsa_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_alsa.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ - > $(DEPDIR)/audio_alsa.Sd; \ - $(RM) $(DEPDIR)/audio_alsa.Std; \ - $(MV) $(DEPDIR)/audio_alsa.Sd $(DEPDIR)/audio_alsa.Std; \ + $(RM) $(DEPDIR)/audio_alsa_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa_guile.Std \ + > $(DEPDIR)/audio_alsa_guile.Sd; \ + $(RM) $(DEPDIR)/audio_alsa_guile.Std; \ + $(MV) $(DEPDIR)/audio_alsa_guile.Sd $(DEPDIR)/audio_alsa_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \ + $(RM) $(DEPDIR)/audio_alsa_guile.S*; exit 1; \ fi; touch $(DEPDIR)/audio_alsa-generate-guile-stamp + $(RM) $(DEPDIR)/audio_alsa_guile.d + cp $(DEPDIR)/audio_alsa_guile.Std $(DEPDIR)/audio_alsa_guile.d + echo "" >> $(DEPDIR)/audio_alsa_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_alsa_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa_guile.d + $(RM) $(DEPDIR)/audio_alsa_guile.Std + touch $(DEPDIR)/audio_alsa-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/audio_alsa_guile.d@am__quote@ endif $(DEPDIR)/audio_alsa-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/audio_alsa-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_alsa_swig_args) \ - -MD -MF $(DEPDIR)/audio_alsa.Std \ + -MD -MF $(DEPDIR)/audio_alsa_python.Std \ -module audio_alsa -o audio_alsa_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_alsa.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ - > $(DEPDIR)/audio_alsa.Sd; \ - $(RM) $(DEPDIR)/audio_alsa.Std; \ - $(MV) $(DEPDIR)/audio_alsa.Sd $(DEPDIR)/audio_alsa.Std; \ + $(RM) $(DEPDIR)/audio_alsa_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa_python.Std \ + > $(DEPDIR)/audio_alsa_python.Sd; \ + $(RM) $(DEPDIR)/audio_alsa_python.Std; \ + $(MV) $(DEPDIR)/audio_alsa_python.Sd $(DEPDIR)/audio_alsa_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \ + $(RM) $(DEPDIR)/audio_alsa_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/audio_alsa-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/audio_alsa.d + $(RM) $(DEPDIR)/audio_alsa_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/audio_alsa.Std $(DEPDIR)/audio_alsa.d + cp $(DEPDIR)/audio_alsa_python.Std $(DEPDIR)/audio_alsa_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/audio_alsa.d + echo "" >> $(DEPDIR)/audio_alsa_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)/audio_alsa.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_alsa_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/audio_alsa.Std + $(RM) $(DEPDIR)/audio_alsa_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)/audio_alsa-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)/audio_alsa.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/audio_alsa_python.d@am__quote@ diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen index 23c8a4618..135c3c7e4 100644 --- a/gr-audio-oss/src/Makefile.swig.gen +++ b/gr-audio-oss/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -audio_oss.h audio_oss.py audio_oss_python.cc: audio_oss.i +audio_oss_python.h audio_oss.py audio_oss_python.cc audio_oss_guile.cc audio_oss_guile.h: audio_oss.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 @@ audio_oss.h audio_oss.py audio_oss_python.cc: audio_oss.i $(DEPDIR)/audio_oss-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_oss_swig_args) \ - -MD -MF $(DEPDIR)/audio_oss.Std \ + -MD -MF $(DEPDIR)/audio_oss_guile.Std \ -module audio_oss -o audio_oss_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_oss.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ - > $(DEPDIR)/audio_oss.Sd; \ - $(RM) $(DEPDIR)/audio_oss.Std; \ - $(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \ + $(RM) $(DEPDIR)/audio_oss_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss_guile.Std \ + > $(DEPDIR)/audio_oss_guile.Sd; \ + $(RM) $(DEPDIR)/audio_oss_guile.Std; \ + $(MV) $(DEPDIR)/audio_oss_guile.Sd $(DEPDIR)/audio_oss_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \ + $(RM) $(DEPDIR)/audio_oss_guile.S*; exit 1; \ fi; touch $(DEPDIR)/audio_oss-generate-guile-stamp + $(RM) $(DEPDIR)/audio_oss_guile.d + cp $(DEPDIR)/audio_oss_guile.Std $(DEPDIR)/audio_oss_guile.d + echo "" >> $(DEPDIR)/audio_oss_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss_guile.d + $(RM) $(DEPDIR)/audio_oss_guile.Std + touch $(DEPDIR)/audio_oss-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/audio_oss_guile.d@am__quote@ endif $(DEPDIR)/audio_oss-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/audio_oss-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \ - -MD -MF $(DEPDIR)/audio_oss.Std \ + -MD -MF $(DEPDIR)/audio_oss_python.Std \ -module audio_oss -o audio_oss_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_oss.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ - > $(DEPDIR)/audio_oss.Sd; \ - $(RM) $(DEPDIR)/audio_oss.Std; \ - $(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \ + $(RM) $(DEPDIR)/audio_oss_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss_python.Std \ + > $(DEPDIR)/audio_oss_python.Sd; \ + $(RM) $(DEPDIR)/audio_oss_python.Std; \ + $(MV) $(DEPDIR)/audio_oss_python.Sd $(DEPDIR)/audio_oss_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \ + $(RM) $(DEPDIR)/audio_oss_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/audio_oss-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/audio_oss.d + $(RM) $(DEPDIR)/audio_oss_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/audio_oss.Std $(DEPDIR)/audio_oss.d + cp $(DEPDIR)/audio_oss_python.Std $(DEPDIR)/audio_oss_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/audio_oss.d + echo "" >> $(DEPDIR)/audio_oss_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)/audio_oss.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/audio_oss.Std + $(RM) $(DEPDIR)/audio_oss_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)/audio_oss-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)/audio_oss.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/audio_oss_python.d@am__quote@ diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen index 1d210b7c4..6bfcc2a46 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen +++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder_python.cc: cvsd_vocoder.i +cvsd_vocoder_python.h cvsd_vocoder.py cvsd_vocoder_python.cc cvsd_vocoder_guile.cc cvsd_vocoder_guile.h: cvsd_vocoder.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 @@ cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder_python.cc: cvsd_vocoder.i $(DEPDIR)/cvsd_vocoder-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(cvsd_vocoder_swig_args) \ - -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ + -MD -MF $(DEPDIR)/cvsd_vocoder_guile.Std \ -module cvsd_vocoder -o cvsd_vocoder_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ - > $(DEPDIR)/cvsd_vocoder.Sd; \ - $(RM) $(DEPDIR)/cvsd_vocoder.Std; \ - $(MV) $(DEPDIR)/cvsd_vocoder.Sd $(DEPDIR)/cvsd_vocoder.Std; \ + $(RM) $(DEPDIR)/cvsd_vocoder_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder_guile.Std \ + > $(DEPDIR)/cvsd_vocoder_guile.Sd; \ + $(RM) $(DEPDIR)/cvsd_vocoder_guile.Std; \ + $(MV) $(DEPDIR)/cvsd_vocoder_guile.Sd $(DEPDIR)/cvsd_vocoder_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \ + $(RM) $(DEPDIR)/cvsd_vocoder_guile.S*; exit 1; \ fi; touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp + $(RM) $(DEPDIR)/cvsd_vocoder_guile.d + cp $(DEPDIR)/cvsd_vocoder_guile.Std $(DEPDIR)/cvsd_vocoder_guile.d + echo "" >> $(DEPDIR)/cvsd_vocoder_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/cvsd_vocoder_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder_guile.d + $(RM) $(DEPDIR)/cvsd_vocoder_guile.Std + touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder_guile.d@am__quote@ endif $(DEPDIR)/cvsd_vocoder-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/cvsd_vocoder-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(cvsd_vocoder_swig_args) \ - -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ + -MD -MF $(DEPDIR)/cvsd_vocoder_python.Std \ -module cvsd_vocoder -o cvsd_vocoder_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ - > $(DEPDIR)/cvsd_vocoder.Sd; \ - $(RM) $(DEPDIR)/cvsd_vocoder.Std; \ - $(MV) $(DEPDIR)/cvsd_vocoder.Sd $(DEPDIR)/cvsd_vocoder.Std; \ + $(RM) $(DEPDIR)/cvsd_vocoder_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder_python.Std \ + > $(DEPDIR)/cvsd_vocoder_python.Sd; \ + $(RM) $(DEPDIR)/cvsd_vocoder_python.Std; \ + $(MV) $(DEPDIR)/cvsd_vocoder_python.Sd $(DEPDIR)/cvsd_vocoder_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \ + $(RM) $(DEPDIR)/cvsd_vocoder_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/cvsd_vocoder-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/cvsd_vocoder.d + $(RM) $(DEPDIR)/cvsd_vocoder_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/cvsd_vocoder.Std $(DEPDIR)/cvsd_vocoder.d + cp $(DEPDIR)/cvsd_vocoder_python.Std $(DEPDIR)/cvsd_vocoder_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/cvsd_vocoder.d + echo "" >> $(DEPDIR)/cvsd_vocoder_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)/cvsd_vocoder.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/cvsd_vocoder_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/cvsd_vocoder.Std + $(RM) $(DEPDIR)/cvsd_vocoder_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)/cvsd_vocoder-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)/cvsd_vocoder.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder_python.d@am__quote@ diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen index b95bafc2b..094aecfdb 100644 --- a/gr-gcell/src/Makefile.swig.gen +++ b/gr-gcell/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gcell.h gcell.py gcell_python.cc: gcell.i +gcell_python.h gcell.py gcell_python.cc gcell_guile.cc gcell_guile.h: gcell.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -207,20 +207,31 @@ gcell.h gcell.py gcell_python.cc: gcell.i fi; $(DEPDIR)/gcell-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gcell_swig_args) \ - -MD -MF $(DEPDIR)/gcell.Std \ + -MD -MF $(DEPDIR)/gcell_guile.Std \ -module gcell -o gcell_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gcell.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ - > $(DEPDIR)/gcell.Sd; \ - $(RM) $(DEPDIR)/gcell.Std; \ - $(MV) $(DEPDIR)/gcell.Sd $(DEPDIR)/gcell.Std; \ + $(RM) $(DEPDIR)/gcell_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell_guile.Std \ + > $(DEPDIR)/gcell_guile.Sd; \ + $(RM) $(DEPDIR)/gcell_guile.Std; \ + $(MV) $(DEPDIR)/gcell_guile.Sd $(DEPDIR)/gcell_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gcell.S*; exit 1; \ + $(RM) $(DEPDIR)/gcell_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gcell-generate-guile-stamp + $(RM) $(DEPDIR)/gcell_guile.d + cp $(DEPDIR)/gcell_guile.Std $(DEPDIR)/gcell_guile.d + echo "" >> $(DEPDIR)/gcell_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell_guile.d + $(RM) $(DEPDIR)/gcell_guile.Std + touch $(DEPDIR)/gcell-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gcell_guile.d@am__quote@ +endif $(DEPDIR)/gcell-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -232,17 +243,17 @@ $(DEPDIR)/gcell-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gcell_swig_args) \ - -MD -MF $(DEPDIR)/gcell.Std \ + -MD -MF $(DEPDIR)/gcell_python.Std \ -module gcell -o gcell_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gcell.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ - > $(DEPDIR)/gcell.Sd; \ - $(RM) $(DEPDIR)/gcell.Std; \ - $(MV) $(DEPDIR)/gcell.Sd $(DEPDIR)/gcell.Std; \ + $(RM) $(DEPDIR)/gcell_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell_python.Std \ + > $(DEPDIR)/gcell_python.Sd; \ + $(RM) $(DEPDIR)/gcell_python.Std; \ + $(MV) $(DEPDIR)/gcell_python.Sd $(DEPDIR)/gcell_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gcell.S*; exit 1; \ + $(RM) $(DEPDIR)/gcell_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -254,27 +265,27 @@ $(DEPDIR)/gcell-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gcell.d + $(RM) $(DEPDIR)/gcell_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gcell.Std $(DEPDIR)/gcell.d + cp $(DEPDIR)/gcell_python.Std $(DEPDIR)/gcell_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gcell.d + echo "" >> $(DEPDIR)/gcell_python.d ## ## (4) from the SWIG file, remove the first line (the target); remove ## trailing " \" and " " from each line. Append ":" to each line, ## followed by 2 carriage returns, then append this to the end of ## the dependency file. ## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gcell.Std + $(RM) $(DEPDIR)/gcell_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -286,5 +297,5 @@ $(DEPDIR)/gcell-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)/gcell.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gcell_python.d@am__quote@ diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen index ac879f08e..87486d1ff 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gsm_full_rate.h gsm_full_rate.py gsm_full_rate_python.cc: gsm_full_rate.i +gsm_full_rate_python.h gsm_full_rate.py gsm_full_rate_python.cc gsm_full_rate_guile.cc gsm_full_rate_guile.h: gsm_full_rate.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 @@ gsm_full_rate.h gsm_full_rate.py gsm_full_rate_python.cc: gsm_full_rate.i $(DEPDIR)/gsm_full_rate-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gsm_full_rate_swig_args) \ - -MD -MF $(DEPDIR)/gsm_full_rate.Std \ + -MD -MF $(DEPDIR)/gsm_full_rate_guile.Std \ -module gsm_full_rate -o gsm_full_rate_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ - > $(DEPDIR)/gsm_full_rate.Sd; \ - $(RM) $(DEPDIR)/gsm_full_rate.Std; \ - $(MV) $(DEPDIR)/gsm_full_rate.Sd $(DEPDIR)/gsm_full_rate.Std; \ + $(RM) $(DEPDIR)/gsm_full_rate_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate_guile.Std \ + > $(DEPDIR)/gsm_full_rate_guile.Sd; \ + $(RM) $(DEPDIR)/gsm_full_rate_guile.Std; \ + $(MV) $(DEPDIR)/gsm_full_rate_guile.Sd $(DEPDIR)/gsm_full_rate_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \ + $(RM) $(DEPDIR)/gsm_full_rate_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp + $(RM) $(DEPDIR)/gsm_full_rate_guile.d + cp $(DEPDIR)/gsm_full_rate_guile.Std $(DEPDIR)/gsm_full_rate_guile.d + echo "" >> $(DEPDIR)/gsm_full_rate_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm_full_rate_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate_guile.d + $(RM) $(DEPDIR)/gsm_full_rate_guile.Std + touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate_guile.d@am__quote@ endif $(DEPDIR)/gsm_full_rate-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/gsm_full_rate-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_full_rate_swig_args) \ - -MD -MF $(DEPDIR)/gsm_full_rate.Std \ + -MD -MF $(DEPDIR)/gsm_full_rate_python.Std \ -module gsm_full_rate -o gsm_full_rate_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ - > $(DEPDIR)/gsm_full_rate.Sd; \ - $(RM) $(DEPDIR)/gsm_full_rate.Std; \ - $(MV) $(DEPDIR)/gsm_full_rate.Sd $(DEPDIR)/gsm_full_rate.Std; \ + $(RM) $(DEPDIR)/gsm_full_rate_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate_python.Std \ + > $(DEPDIR)/gsm_full_rate_python.Sd; \ + $(RM) $(DEPDIR)/gsm_full_rate_python.Std; \ + $(MV) $(DEPDIR)/gsm_full_rate_python.Sd $(DEPDIR)/gsm_full_rate_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \ + $(RM) $(DEPDIR)/gsm_full_rate_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/gsm_full_rate-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gsm_full_rate.d + $(RM) $(DEPDIR)/gsm_full_rate_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gsm_full_rate.Std $(DEPDIR)/gsm_full_rate.d + cp $(DEPDIR)/gsm_full_rate_python.Std $(DEPDIR)/gsm_full_rate_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gsm_full_rate.d + echo "" >> $(DEPDIR)/gsm_full_rate_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)/gsm_full_rate.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm_full_rate_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gsm_full_rate.Std + $(RM) $(DEPDIR)/gsm_full_rate_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)/gsm_full_rate-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)/gsm_full_rate.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate_python.d@am__quote@ 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@ diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen index c710bddd6..1f22987db 100644 --- a/gr-noaa/swig/Makefile.swig.gen +++ b/gr-noaa/swig/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -noaa_swig.h noaa_swig.py noaa_swig_python.cc: noaa_swig.i +noaa_swig_python.h noaa_swig.py noaa_swig_python.cc noaa_swig_guile.cc noaa_swig_guile.h: noaa_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 @@ noaa_swig.h noaa_swig.py noaa_swig_python.cc: noaa_swig.i $(DEPDIR)/noaa_swig-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(noaa_swig_swig_args) \ - -MD -MF $(DEPDIR)/noaa_swig.Std \ + -MD -MF $(DEPDIR)/noaa_swig_guile.Std \ -module noaa_swig -o noaa_swig_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/noaa_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \ - > $(DEPDIR)/noaa_swig.Sd; \ - $(RM) $(DEPDIR)/noaa_swig.Std; \ - $(MV) $(DEPDIR)/noaa_swig.Sd $(DEPDIR)/noaa_swig.Std; \ + $(RM) $(DEPDIR)/noaa_swig_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig_guile.Std \ + > $(DEPDIR)/noaa_swig_guile.Sd; \ + $(RM) $(DEPDIR)/noaa_swig_guile.Std; \ + $(MV) $(DEPDIR)/noaa_swig_guile.Sd $(DEPDIR)/noaa_swig_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/noaa_swig.S*; exit 1; \ + $(RM) $(DEPDIR)/noaa_swig_guile.S*; exit 1; \ fi; touch $(DEPDIR)/noaa_swig-generate-guile-stamp + $(RM) $(DEPDIR)/noaa_swig_guile.d + cp $(DEPDIR)/noaa_swig_guile.Std $(DEPDIR)/noaa_swig_guile.d + echo "" >> $(DEPDIR)/noaa_swig_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/noaa_swig_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/noaa_swig_guile.d + $(RM) $(DEPDIR)/noaa_swig_guile.Std + touch $(DEPDIR)/noaa_swig-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/noaa_swig_guile.d@am__quote@ endif $(DEPDIR)/noaa_swig-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/noaa_swig-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(noaa_swig_swig_args) \ - -MD -MF $(DEPDIR)/noaa_swig.Std \ + -MD -MF $(DEPDIR)/noaa_swig_python.Std \ -module noaa_swig -o noaa_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/noaa_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \ - > $(DEPDIR)/noaa_swig.Sd; \ - $(RM) $(DEPDIR)/noaa_swig.Std; \ - $(MV) $(DEPDIR)/noaa_swig.Sd $(DEPDIR)/noaa_swig.Std; \ + $(RM) $(DEPDIR)/noaa_swig_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig_python.Std \ + > $(DEPDIR)/noaa_swig_python.Sd; \ + $(RM) $(DEPDIR)/noaa_swig_python.Std; \ + $(MV) $(DEPDIR)/noaa_swig_python.Sd $(DEPDIR)/noaa_swig_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/noaa_swig.S*; exit 1; \ + $(RM) $(DEPDIR)/noaa_swig_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/noaa_swig-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/noaa_swig.d + $(RM) $(DEPDIR)/noaa_swig_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/noaa_swig.Std $(DEPDIR)/noaa_swig.d + cp $(DEPDIR)/noaa_swig_python.Std $(DEPDIR)/noaa_swig_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/noaa_swig.d + echo "" >> $(DEPDIR)/noaa_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)/noaa_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/noaa_swig.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/noaa_swig_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/noaa_swig_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/noaa_swig.Std + $(RM) $(DEPDIR)/noaa_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)/noaa_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)/noaa_swig.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/noaa_swig_python.d@am__quote@ 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@ diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index ab23f1618..a51e8eb87 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -qtgui.h qtgui.py qtgui_python.cc: qtgui.i +qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.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 @@ qtgui.h qtgui.py qtgui_python.cc: qtgui.i $(DEPDIR)/qtgui-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \ - -MD -MF $(DEPDIR)/qtgui.Std \ + -MD -MF $(DEPDIR)/qtgui_guile.Std \ -module qtgui -o qtgui_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/qtgui.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ - > $(DEPDIR)/qtgui.Sd; \ - $(RM) $(DEPDIR)/qtgui.Std; \ - $(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \ + $(RM) $(DEPDIR)/qtgui_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \ + > $(DEPDIR)/qtgui_guile.Sd; \ + $(RM) $(DEPDIR)/qtgui_guile.Std; \ + $(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ + $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \ fi; touch $(DEPDIR)/qtgui-generate-guile-stamp + $(RM) $(DEPDIR)/qtgui_guile.d + cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d + echo "" >> $(DEPDIR)/qtgui_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d + $(RM) $(DEPDIR)/qtgui_guile.Std + touch $(DEPDIR)/qtgui-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@ endif $(DEPDIR)/qtgui-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/qtgui-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \ - -MD -MF $(DEPDIR)/qtgui.Std \ + -MD -MF $(DEPDIR)/qtgui_python.Std \ -module qtgui -o qtgui_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/qtgui.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ - > $(DEPDIR)/qtgui.Sd; \ - $(RM) $(DEPDIR)/qtgui.Std; \ - $(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \ + $(RM) $(DEPDIR)/qtgui_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_python.Std \ + > $(DEPDIR)/qtgui_python.Sd; \ + $(RM) $(DEPDIR)/qtgui_python.Std; \ + $(MV) $(DEPDIR)/qtgui_python.Sd $(DEPDIR)/qtgui_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ + $(RM) $(DEPDIR)/qtgui_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/qtgui-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/qtgui.d + $(RM) $(DEPDIR)/qtgui_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/qtgui.Std $(DEPDIR)/qtgui.d + cp $(DEPDIR)/qtgui_python.Std $(DEPDIR)/qtgui_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/qtgui.d + echo "" >> $(DEPDIR)/qtgui_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)/qtgui.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/qtgui.Std + $(RM) $(DEPDIR)/qtgui_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)/qtgui-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)/qtgui.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/qtgui_python.d@am__quote@ diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen index 185052b4f..72b5f4386 100644 --- a/gr-radio-astronomy/src/lib/Makefile.swig.gen +++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -ra.h ra.py ra_python.cc: ra.i +ra_python.h ra.py ra_python.cc ra_guile.cc ra_guile.h: ra.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 @@ ra.h ra.py ra_python.cc: ra.i $(DEPDIR)/ra-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(ra_swig_args) \ - -MD -MF $(DEPDIR)/ra.Std \ + -MD -MF $(DEPDIR)/ra_guile.Std \ -module ra -o ra_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/ra.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ - > $(DEPDIR)/ra.Sd; \ - $(RM) $(DEPDIR)/ra.Std; \ - $(MV) $(DEPDIR)/ra.Sd $(DEPDIR)/ra.Std; \ + $(RM) $(DEPDIR)/ra_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra_guile.Std \ + > $(DEPDIR)/ra_guile.Sd; \ + $(RM) $(DEPDIR)/ra_guile.Std; \ + $(MV) $(DEPDIR)/ra_guile.Sd $(DEPDIR)/ra_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/ra.S*; exit 1; \ + $(RM) $(DEPDIR)/ra_guile.S*; exit 1; \ fi; touch $(DEPDIR)/ra-generate-guile-stamp + $(RM) $(DEPDIR)/ra_guile.d + cp $(DEPDIR)/ra_guile.Std $(DEPDIR)/ra_guile.d + echo "" >> $(DEPDIR)/ra_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra_guile.d + $(RM) $(DEPDIR)/ra_guile.Std + touch $(DEPDIR)/ra-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/ra_guile.d@am__quote@ endif $(DEPDIR)/ra-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/ra-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(ra_swig_args) \ - -MD -MF $(DEPDIR)/ra.Std \ + -MD -MF $(DEPDIR)/ra_python.Std \ -module ra -o ra_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/ra.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ - > $(DEPDIR)/ra.Sd; \ - $(RM) $(DEPDIR)/ra.Std; \ - $(MV) $(DEPDIR)/ra.Sd $(DEPDIR)/ra.Std; \ + $(RM) $(DEPDIR)/ra_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra_python.Std \ + > $(DEPDIR)/ra_python.Sd; \ + $(RM) $(DEPDIR)/ra_python.Std; \ + $(MV) $(DEPDIR)/ra_python.Sd $(DEPDIR)/ra_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/ra.S*; exit 1; \ + $(RM) $(DEPDIR)/ra_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/ra-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/ra.d + $(RM) $(DEPDIR)/ra_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/ra.Std $(DEPDIR)/ra.d + cp $(DEPDIR)/ra_python.Std $(DEPDIR)/ra_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/ra.d + echo "" >> $(DEPDIR)/ra_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)/ra.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/ra.Std + $(RM) $(DEPDIR)/ra_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)/ra-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)/ra.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/ra_python.d@am__quote@ diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 2498b334e..a52a3cbe2 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -usrp2.h usrp2.py usrp2_python.cc: usrp2.i +usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.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 @@ usrp2.h usrp2.py usrp2_python.cc: usrp2.i $(DEPDIR)/usrp2-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ + -MD -MF $(DEPDIR)/usrp2_guile.Std \ -module usrp2 -o usrp2_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ + $(RM) $(DEPDIR)/usrp2_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_guile.Std \ + > $(DEPDIR)/usrp2_guile.Sd; \ + $(RM) $(DEPDIR)/usrp2_guile.Std; \ + $(MV) $(DEPDIR)/usrp2_guile.Sd $(DEPDIR)/usrp2_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp2_guile.S*; exit 1; \ fi; touch $(DEPDIR)/usrp2-generate-guile-stamp + $(RM) $(DEPDIR)/usrp2_guile.d + cp $(DEPDIR)/usrp2_guile.Std $(DEPDIR)/usrp2_guile.d + echo "" >> $(DEPDIR)/usrp2_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d + $(RM) $(DEPDIR)/usrp2_guile.Std + touch $(DEPDIR)/usrp2-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@ endif $(DEPDIR)/usrp2-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ + -MD -MF $(DEPDIR)/usrp2_python.Std \ -module usrp2 -o usrp2_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ + $(RM) $(DEPDIR)/usrp2_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2_python.Std \ + > $(DEPDIR)/usrp2_python.Sd; \ + $(RM) $(DEPDIR)/usrp2_python.Std; \ + $(MV) $(DEPDIR)/usrp2_python.Sd $(DEPDIR)/usrp2_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp2_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/usrp2.d + $(RM) $(DEPDIR)/usrp2_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/usrp2.Std $(DEPDIR)/usrp2.d + cp $(DEPDIR)/usrp2_python.Std $(DEPDIR)/usrp2_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/usrp2.d + echo "" >> $(DEPDIR)/usrp2_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)/usrp2.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/usrp2.Std + $(RM) $(DEPDIR)/usrp2_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)/usrp2-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)/usrp2.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@ diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen index 41bf20c89..97df2d21e 100644 --- a/gr-video-sdl/src/Makefile.swig.gen +++ b/gr-video-sdl/src/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -video_sdl.h video_sdl.py video_sdl_python.cc: video_sdl.i +video_sdl_python.h video_sdl.py video_sdl_python.cc video_sdl_guile.cc video_sdl_guile.h: video_sdl.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 @@ video_sdl.h video_sdl.py video_sdl_python.cc: video_sdl.i $(DEPDIR)/video_sdl-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(video_sdl_swig_args) \ - -MD -MF $(DEPDIR)/video_sdl.Std \ + -MD -MF $(DEPDIR)/video_sdl_guile.Std \ -module video_sdl -o video_sdl_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/video_sdl.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ - > $(DEPDIR)/video_sdl.Sd; \ - $(RM) $(DEPDIR)/video_sdl.Std; \ - $(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \ + $(RM) $(DEPDIR)/video_sdl_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl_guile.Std \ + > $(DEPDIR)/video_sdl_guile.Sd; \ + $(RM) $(DEPDIR)/video_sdl_guile.Std; \ + $(MV) $(DEPDIR)/video_sdl_guile.Sd $(DEPDIR)/video_sdl_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \ + $(RM) $(DEPDIR)/video_sdl_guile.S*; exit 1; \ fi; touch $(DEPDIR)/video_sdl-generate-guile-stamp + $(RM) $(DEPDIR)/video_sdl_guile.d + cp $(DEPDIR)/video_sdl_guile.Std $(DEPDIR)/video_sdl_guile.d + echo "" >> $(DEPDIR)/video_sdl_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl_guile.d + $(RM) $(DEPDIR)/video_sdl_guile.Std + touch $(DEPDIR)/video_sdl-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/video_sdl_guile.d@am__quote@ endif $(DEPDIR)/video_sdl-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/video_sdl-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \ - -MD -MF $(DEPDIR)/video_sdl.Std \ + -MD -MF $(DEPDIR)/video_sdl_python.Std \ -module video_sdl -o video_sdl_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/video_sdl.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ - > $(DEPDIR)/video_sdl.Sd; \ - $(RM) $(DEPDIR)/video_sdl.Std; \ - $(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \ + $(RM) $(DEPDIR)/video_sdl_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl_python.Std \ + > $(DEPDIR)/video_sdl_python.Sd; \ + $(RM) $(DEPDIR)/video_sdl_python.Std; \ + $(MV) $(DEPDIR)/video_sdl_python.Sd $(DEPDIR)/video_sdl_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \ + $(RM) $(DEPDIR)/video_sdl_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/video_sdl-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/video_sdl.d + $(RM) $(DEPDIR)/video_sdl_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/video_sdl.Std $(DEPDIR)/video_sdl.d + cp $(DEPDIR)/video_sdl_python.Std $(DEPDIR)/video_sdl_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/video_sdl.d + echo "" >> $(DEPDIR)/video_sdl_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)/video_sdl.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/video_sdl.Std + $(RM) $(DEPDIR)/video_sdl_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)/video_sdl-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)/video_sdl.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/video_sdl_python.d@am__quote@ |