From e27ba9aebfddf88cd245636d2f652a4ee4e289ec Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Mon, 7 Aug 2006 15:41:19 +0000
Subject: Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
 /gnuradio/branches/developers/jcorgan/ticket-10.  'make distcheck' now
 successfully completes on a machine that has never had gnuradio installed
 before.  In addition, several cleanups and refactoring of build system code
 have been applied.  NOTE: gr-audio-portaudio, gr-audio-osx, and
 gr-audio-windows have not been fully tested and will need verification by the
 maintainers of these components.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-gsm-fr-vocoder/src/lib/Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gr-gsm-fr-vocoder/src/lib/Makefile.am')

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 974604d92..06ab5caab 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -23,8 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = gsm .
 
-LIBS += $(GNURADIO_CORE_LIBS)
-
 # Install this stuff so that it ends up as the gnuradio.vocoder module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
@@ -42,7 +40,7 @@ ALL_IFILES = 				\
 	$(NON_LOCAL_IFILES)		
 
 NON_LOCAL_IFILES =			\
-	$(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+	$(GNURADIO_I)
 
 
 LOCAL_IFILES = 				\
@@ -78,6 +76,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 _gsm_full_rate_la_LIBADD = 	\
 	gsm/libgsm.la		\
 	$(PYTHON_LDFLAGS)	\
+	$(GNURADIO_CORE_LIBS)	\
 	-lstdc++			
 
 gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
-- 
cgit