X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-audio-oss%2Fsrc%2FMakefile.am;h=628c9fd9304c52096902d397eff3b697386f7883;hb=refs%2Fheads%2Ftry-3.3.1;hp=f2f173b5963d07a96299e5c5f21213ffc234ad35;hpb=42d9c6f495503d3d9d2db47a9979036c9233f976;p=debian%2Fgnuradio

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index f2f173b5..628c9fd9 100644
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,70 +21,54 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.audio_oss module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-audio-oss/src/audio_oss.i
-
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)
-
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
-
-BUILT_SOURCES = 			\
-	audio_oss.cc			\
-	audio_oss.py			
 
-ourpython_PYTHON =			\
-	audio_oss.py
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS =		\
+	audio_oss_sink.h	\
+	audio_oss_source.h
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+noinst_PYTHON = qa_oss.py
 
-ourlib_LTLIBRARIES = _audio_oss.la
+lib_LTLIBRARIES = libgnuradio-audio-oss.la
 
-_audio_oss_la_SOURCES = 		\
-	audio_oss.cc			\
+libgnuradio_audio_oss_la_SOURCES = 	\
 	audio_oss_sink.cc		\
 	audio_oss_source.cc
 
-grinclude_HEADERS =			\
-	audio_oss_sink.h		\
-	audio_oss_source.h	
+libgnuradio_audio_oss_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
+	$(OSS_LIBS)
 
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
+libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-_audio_oss_la_LIBADD = 			\
-	$(PYTHON_LDFLAGS)		\
-	$(GNURADIO_CORE_LA)		\
-	$(OSS_LIBS)			\
-	-lstdc++
+if PYTHON
+###################################
+# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
-_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+TOP_SWIG_IFILES =		\
+	audio_oss.i
 
-audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+#   import gnuradio.audio_oss
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+audio_oss_pythondir_category =	\
+	gnuradio
 
-# 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
+# additional libraries for linking with the SWIG-generated library
+audio_oss_la_swig_libadd =	\
+	libgnuradio-audio-oss.la
 
-noinst_PYTHON = qa_oss.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)
 
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)
+endif