Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gr-comedi / src / Makefile.am

diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index 00e14c77c01e8b070d789acdfa3868b2a6083968..a55bd175b9d6daf85bf79efe8a9d0f113a386af8 100644 (file)
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2008 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,79 +21,59 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.comedi module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
 EXTRA_DIST = run_tests.in
 
-TESTS = run_tests
-
-LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-comedi/src/comedi.i                            
-
-NON_LOCAL_IFILES =                     \
-       $(GNURADIO_I)
-
-ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 \
-       $(NON_LOCAL_IFILES)             
-
-BUILT_SOURCES =                        \
-       comedi.cc                       \
-       comedi.py                               
-
-ourpython_PYTHON =                     \
-       comedi.py
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \
-       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-#      -I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir)
-
-ourlib_LTLIBRARIES = _comedi.la
-
-_comedi_la_SOURCES =           \
-       comedi.cc               \
-       comedi_sink_s.cc        \
-       comedi_source_s.cc      \
-       gri_comedi.cc                   
-
+# C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =            \
        comedi_sink_s.h         \
-       comedi_source_s.h               
+       comedi_source_s.h
+
+noinst_HEADERS =               \
+       gri_comedi.h
 
-noinst_HEADERS =               \
-       gri_comedi.h                    
+noinst_PYTHON =                        \
+       qa_comedi.py
 
+lib_LTLIBRARIES = libgnuradio-comedi.la
 
-swiginclude_HEADERS =          \
-       $(LOCAL_IFILES)
+libgnuradio_comedi_la_SOURCES = \
+       comedi_sink_s.cc        \
+       comedi_source_s.cc      \
+       gri_comedi.cc
 
-_comedi_la_LIBADD =            \
-       $(PYTHON_LDFLAGS)       \
+libgnuradio_comedi_la_LIBADD = \
        $(GNURADIO_CORE_LA)     \
-       $(COMEDI_LIBS)          \
-       -lstdc++                                
+       $(COMEDI_LIBS)
 
-_comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+libgnuradio_comedi_la_LDFLAGS =        $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-comedi.cc comedi.py: $(LOCAL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES)
+if PYTHON
+###################################
+# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
+TOP_SWIG_IFILES =              \
+       comedi.i
+
+# Install so that they end up available as:
+#   import gnuradio.comedi
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+comedi_pythondir_category =    \
+       gnuradio
 
-noinst_PYTHON =                \
-       qa_comedi.py                    
+# additional libraries for linking with the SWIG-generated library
+comedi_la_swig_libadd =                \
+       libgnuradio-comedi.la
 
-# 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
+include $(top_srcdir)/Makefile.swig
 
-MOSTLYCLEANFILES = \
-       $(BUILT_SOURCES) *~ *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)
+endif