X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-audio-jack%2Fsrc%2FMakefile.am;h=bd8694a26188709232858d04dbecd80e03b8d5bd;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=bed67ac35ecb751b262991fd3d24d7179ff23265;hpb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;p=debian%2Fgnuradio

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index bed67ac3..bd8694a2 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,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,
@@ -21,77 +21,53 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.audio_jack 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-audio-jack/src/audio_jack.i				
-
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)
-
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
+DISTCLEANFILES = run_tests
 
-BUILT_SOURCES = 			\
-	audio_jack.cc			\
-	audio_jack.py				
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS =			\
+	audio_jack_sink.h		\
+	audio_jack_source.h
 
-ourpython_PYTHON =			\
-	audio_jack.py
+noinst_HEADERS = 			\
+	gri_jack.h
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+noinst_PYTHON = 			\
+	qa_jack.py
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
+###################################
+# SWIG Python interface and library
 
-ourlib_LTLIBRARIES = _audio_jack.la
+TOP_SWIG_IFILES = 			\
+	audio_jack.i
 
+# Install so that they end up available as:
+#   import gnuradio.audio_jack
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+audio_jack_pythondir_category =		\
+	gnuradio
 
-_audio_jack_la_SOURCES = 		\
-	audio_jack.cc			\
+# additional sources for the SWIG-generated library
+audio_jack_la_swig_sources = 		\
 	audio_jack_sink.cc		\
 	audio_jack_source.cc		\
-	gri_jack.cc			
+	gri_jack.cc
 
-grinclude_HEADERS =			\
-	audio_jack_sink.h		\
-	audio_jack_source.h		
-
-noinst_HEADERS = 			\
-	gri_jack.h			
-
-
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
-
-_audio_jack_la_LIBADD = 		\
-	$(PYTHON_LDFLAGS)		\
+# additional libraries for linking with the SWIG-generated library
+audio_jack_la_swig_libadd =		\
 	$(GNURADIO_CORE_LA)		\
-	$(JACK_LIBS)			\
-	-lstdc++				
-
-_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+	$(JACK_LIBS)
 
-audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES)
-
-noinst_PYTHON = 			\
-	qa_jack.py			
+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)
 
-# 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)