X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=usrp%2Fhost%2Fswig%2FMakefile.am;h=d2e6b8bc10be5e7c6b0f0bbd37b5b88e02456e81;hb=7dba4b4a3cf9b2f0fab397494d84c948a3bf85d1;hp=2a1f5b8a5d54570de5fc10d4960d0dbf0e53464a;hpb=951966ca64fc1ddd24889f6318c8c8794657cfba;p=debian%2Fgnuradio

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index 2a1f5b8a..d2e6b8bc 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007,2008,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 2, or (at your option)
+# 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,
@@ -15,70 +15,49 @@
 # 
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
 include $(top_srcdir)/Makefile.common
 
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/usrp_prims
+AM_CPPFLAGS =			\
+	$(USRP_INCLUDES)	\
+	$(PYTHON_CPPFLAGS)	\
+	-I$(srcdir)		\
+	$(USB_INCLUDES)		\
+	$(WITH_INCLUDES)
 
-ourpythondir = $(pythondir)
-ourlibdir    = $(pyexecdir)
+#################################
+# SWIG interface and library
 
-INCLUDES = $(USRP_INCLUDES) 		\
-	   $(PYTHON_CPPFLAGS) 		\
-	   -I$(srcdir)
+TOP_SWIG_IFILES =		\
+	usrp_prims.i
 
-LOCAL_IFILES =				\
-	prims.i
+# Install so that they end up available as:
+#   import usrpm.usrp_prims
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/usrpm
+usrp_prims_pythondir_category =	\
+	usrpm
 
+# additional arguments to the SWIG command
+usrp_prims_swig_args =		\
+	$(USRP_INCLUDES)
 
-ALL_IFILES =				\
-	$(LOCAL_IFILES)			
+# additional libraries for linking with the SWIG-generated library
+usrp_prims_la_swig_libadd =	\
+	$(USRP_LA)
 
+# additional Python files to be installed along with the SWIG-generated one
+usrp_prims_python =		\
+	__init__.py		\
+	usrp_fpga_regs.py
 
-EXTRA_DIST = 				\
-	$(LOCAL_IFILES)
+include $(top_srcdir)/Makefile.swig
 
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
-BUILT_SOURCES =				\
-	prims.cc			\
-	usrp_prims.py
-
-
-ourpython_PYTHON = 			\
-	__init__.py			\
-	usrp_fpga_regs.py		\
-	usrp_prims.py			
-
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
-
-
-ourlib_LTLIBRARIES = 			\
-	_usrp_prims.la
-
-_usrp_prims_la_SOURCES = 		\
-	prims.cc		
-
-
-noinst_HEADERS =
-
-_usrp_prims_la_LIBADD  = $(top_builddir)/usrp/host/lib/libusrp.la -lstdc++ $(PYTHON_LDFLAGS)
-_usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-
-
-prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
-	$(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc $<
-
-
-MOSTLYCLEANFILES = \
-	prims.cc usrp_prims.py *~ *.pyc
-
-# Don't distribute output of swig
-dist-hook:
-	@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
-	@for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
-
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)