3 files changed, 33 insertions, 12 deletions
diff --git a/gr-audio-oss/Makefile.am b/gr-audio-oss/Makefile.am
index 7b4fca6dc..697c9a604 100644
--- a/gr-audio-oss/Makefile.am
+++ b/gr-audio-oss/Makefile.am
@@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-oss.pc
+
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-oss.conf
diff --git a/gr-audio-oss/gnuradio-audio-oss.pc.in b/gr-audio-oss/gnuradio-audio-oss.pc.in
new file mode 100644
index 000000000..f598ba304
--- /dev/null
+++ b/gr-audio-oss/gnuradio-audio-oss.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-audio-oss
+Description: The GNU Radio block for the OSS sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-oss
+Cflags: -I${includedir}
diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index f83ba68ca..614280639 100644
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -21,11 +21,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-DISTCLEANFILES = run_tests
+EXTRA_DIST = run_tests.in
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =		\
@@ -34,10 +32,24 @@ grinclude_HEADERS =		\
 
 noinst_PYTHON = qa_oss.py
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+lib_LTLIBRARIES = libgnuradio-audio-oss.la
+
+libgnuradio_audio_oss_la_SOURCES = 	\
+	audio_oss_sink.cc		\
+	audio_oss_source.cc
 
+libgnuradio_audio_oss_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
+	$(OSS_LIBS)
+
+libgnuradio_audio_oss_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =		\
 	audio_oss.i
@@ -49,15 +61,9 @@ TOP_SWIG_IFILES =		\
 audio_oss_pythondir_category =	\
 	gnuradio
 
-# additional sources for the SWIG-generated library
-audio_oss_la_swig_sources =	\
-	audio_oss_sink.cc	\
-	audio_oss_source.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_oss_la_swig_libadd =	\
-	$(GNURADIO_CORE_LA)	\
-	$(OSS_LIBS)
+	libgnuradio-audio-oss.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -66,3 +72,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif