Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/ChangeLog,v
retrieving revision 1.17
diff -r1.17 ChangeLog
0a1,15
> 2003-04-17  Mark Humphreys <marquee@users.sourceforge.net>
> 
> 	* Makefile.am:
> 	* configure.in:
> 	* iradio/Makefile.am:
> 	* lib/Makefile.am:
> 	* lib/view/Makefile.am:
> 	* lib/widgets/Makefile.am:
> 	* library/Makefile.am:
> 	* net-rhythmbox.spec.in:
> 	* shell/Makefile.am:
> 	* views/Makefile.am:
> 
> 	Remove forked monkey-media dependancies, now uses globally installed library
> 	
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
1c1
< SUBDIRS = monkey-media lib views library iradio shell data po help hack-macros
---
> SUBDIRS = lib views library iradio shell data po help hack-macros
Index: configure.in
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/configure.in,v
retrieving revision 1.8
diff -r1.8 configure.in
31a32,35
>                                                                                 
> MONKEYMEDIA_REQUIRED=0.6.1.99
>                                                                                
> AC_SUBST(MONKEYMEDIA_REQUIRED)
40c44,45
< 		  libgnomecanvas-2.0 >= 1.113.0)
---
> 		  libgnomecanvas-2.0 >= 1.113.0 \
> 		  monkey-media >= $MONKEYMEDIA_REQUIRED) 
159,161d163
< monkey-media/Makefile
< monkey-media/stream-info-impl/Makefile
< monkey-media/stream-info-impl/id3-vfs/Makefile
Index: net-rhythmbox.spec.in
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/net-rhythmbox.spec.in,v
retrieving revision 1.2
diff -r1.2 net-rhythmbox.spec.in
11a12
> Requires:       monkey-media >= @MONKEYMEDIA_REQUIRED@
Index: iradio/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/iradio/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
24d23
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
48d47
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/view/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/view/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
17d16
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/widgets/Makefile.am,v
retrieving revision 1.4
diff -r1.4 Makefile.am
50d49
< 	-I$(top_srcdir)/monkey-media			\
60c59
< librbwidgets_la_LIDADD = $(top_builddir)/lib/view/librbview.la $(top_builddir)/monkey-media/libmonkey-media.la
---
> librbwidgets_la_LIDADD = $(top_builddir)/lib/view/librbview.la
Index: library/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/library/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
26d25
< 	-I$(top_srcdir)/monkey-media			\
34c33
< librblibrary_la_LIBADD = $(top_builddir)/lib/librb.la $(top_builddir)/monkey-media/libmonkey-media.la
---
> librblibrary_la_LIBADD = $(top_builddir)/lib/librb.la
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/shell/Makefile.am,v
retrieving revision 1.2
diff -r1.2 Makefile.am
27d26
< 	$(top_builddir)/monkey-media/libmonkey-media.la	        \
37d35
< 	-I$(top_srcdir)/monkey-media			\
Index: views/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/views/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
23d22
< 	-I$(top_srcdir)/monkey-media 			\
