Rengenerate Makefile.swig.gen's

1 files changed, 28 insertions, 218 deletions

diff --git a/host/swig/Makefile.swig.gen b/host/swig/Makefile.swig.gen
index ec80415..830552a 100644
--- a/host/swig/Makefile.swig.gen
+++ b/host/swig/Makefile.swig.gen
@@ -41,12 +41,12 @@ usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_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.
-usrp_prims_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+usrp_prims_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_prims
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmdir = @GUILE_PKDATADIR@/gnuradio
+usrp_prims_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -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 += usrp_prims.py usrp_prims_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 += usrp_prims.py
 if GUILE
-swig_built_sources += usrp_prims.scm usrp_prims_guile.cc
+swig_built_sources += usrp_prims.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,51 @@ usrp_prims_swiginclude_HEADERS =		\
 	$(usrp_prims_swiginclude_headers)
 
 usrp_prims_pylib_LTLIBRARIES =		\
-	_usrp_prims_python.la
+	_usrp_prims.la
 
-_usrp_prims_python_la_SOURCES = 		\
-	usrp_prims_python.cc		\
+_usrp_prims_la_SOURCES = 			\
+	python/usrp_prims.cc		\
 	$(usrp_prims_la_swig_sources)
 
-_usrp_prims_python_la_LIBADD =		\
+_usrp_prims_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
 
-_usrp_prims_python_la_LDFLAGS =		\
+# _usrp_prims_la_DEPENDENCIES = python/usrp_prims.lo
+
+_usrp_prims_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
 
-_usrp_prims_python_la_CXXFLAGS =		\
+_usrp_prims_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)
 
 usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
-	$(usrp_prims_python)
+	$(usrp_prims)
 
 if GUILE
-usrp_prims_scmlib_LTLIBRARIES = _usrp_prims_guile.la
-_usrp_prims_guile_la_SOURCES = 		\
-	usrp_prims_guile.cc		        \
+usrp_prims_scmlib_LTLIBRARIES = usrp_prims_guile.la
+usrp_prims_guile_la_SOURCES = 		\
+	guile/usrp_prims.cc			\
 	$(usrp_prims_la_swig_sources)
 usrp_prims_scm_DATA = usrp_prims.scm
 
 # Guile can use the same flags as python does
-_usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD)
-_usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_python_la_LDFLAGS)
-_usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+usrp_prims_guile_la_LIBADD = $(_usrp_prims_la_LIBADD)
+usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS)
+usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): usrp_prims.i
-usrp_prims_python.h usrp_prims.py usrp_prims_python.cc: usrp_prims.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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-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)/usrp_prims-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)/usrp_prims-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)/usrp_prims-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/usrp_prims.lo: usrp_prims.lo
+usrp_prims.scm: usrp_prims.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.
-usrp_prims_guile.h usrp_prims.scm usrp_prims_guile.cc: usrp_prims.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/usrp_prims-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/usrp_prims-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/usrp_prims-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/usrp_prims-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/usrp_prims-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims_python.Std \
-		-module usrp_prims -o usrp_prims_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_python.Std \
-			> $(DEPDIR)/usrp_prims_python.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims_python.Std; \
-		$(MV) $(DEPDIR)/usrp_prims_python.Sd $(DEPDIR)/usrp_prims_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/usrp_prims_python.Std $(DEPDIR)/usrp_prims_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/usrp_prims_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)/usrp_prims_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims-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)/usrp_prims_python.d@am__quote@
-
-if GUILE
-$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims_guile.Std \
-		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_guile.Std \
-			> $(DEPDIR)/usrp_prims_guile.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims_guile.Std; \
-		$(MV) $(DEPDIR)/usrp_prims_guile.Sd $(DEPDIR)/usrp_prims_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_prims_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-	$(RM) $(DEPDIR)/usrp_prims_guile.d
-	cp $(DEPDIR)/usrp_prims_guile.Std $(DEPDIR)/usrp_prims_guile.d
-	echo "" >> $(DEPDIR)/usrp_prims_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_guile.d
-	$(RM) $(DEPDIR)/usrp_prims_guile.Std
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-else
-	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_guile.d@am__quote@
+python/usrp_prims.lo:
+usrp_prims.lo: usrp_prims.py usrp_prims.scm
+usrp_prims.py: usrp_prims.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+-include python/usrp_prims.d