Colin Walters <walters@debian.org>

2003-07-30  Bob Smith <bob@thestuff.net>
	    Colin Walters <walters@debian.org>

	* Makefile.am:
	* configure.in:
	* corba/Makefile.am:
	* corba/Rhythmbox.idl:
	* data/Makefile.am:
	* shell/Makefile.am:
	* shell/Rhythmbox.idl:

	Move IDL bits to corba/ directory.  Install the IDL file.

ChangeLog

+2003-07-30  Bob Smith <bob@thestuff.net>
+	    Colin Walters <walters@debian.org>
+
+	* Makefile.am:
+	* configure.in:
+	* corba/Makefile.am:
+	* corba/Rhythmbox.idl:
+	* data/Makefile.am:
+	* shell/Makefile.am:
+	* shell/Rhythmbox.idl:
+
+	Move IDL bits to corba/ directory.  Install the IDL file.
+
 2003-07-30  Colin Walters  <cwalters@gnome.org>
 
 	* lib/widgets/rb-node-view.c: (rb_node_view_class_init):

Makefile.am

 # AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = lib sources library iradio shell data po help
+SUBDIRS = lib sources library iradio corba shell data po help
 
 EXTRA_DIST = 			\
 	autogen.sh		\

configure.in

@@ -91,12 +91,14 @@ lib/widgets/Makefile
 lib/egg/Makefile
 library/Makefile
 iradio/Makefile
+corba/Makefile
 shell/Makefile
 data/Makefile
 data/ui/Makefile
 data/art/Makefile
 data/glade/Makefile
 data/node-views/Makefile
+data/rhythmbox.pc
 sources/Makefile
 help/Makefile
 help/C/Makefile

corba/Makefile.am

+#lib_LTLIBRARIES = librbcorba.la
+noinst_LTLIBRARIES = librbcorba.la
+
+librbcorba_la_SOURCES = $(rhythmbox_interface_idl_sources)
+
+rhythmbox_interface_idl_sources =      	\
+	Rhythmbox-common.c	     			\
+	Rhythmbox-stubs.c	     			\
+	Rhythmbox-skels.c	     			\
+	Rhythmbox.h
+
+INCLUDES = 							\
+	$(WARN_CFLAGS)					\
+	$(RHYTHMBOX_CFLAGS)				\
+	-D_XOPEN_SOURCE
+
+include_HEADERS = Rhythmbox.h
+
+idldir = $(prefix)/share/idl
+idl_DATA = Rhythmbox.idl
+
+CLEAN_FILES = $(rhythmbox_interface_idl_sources)
+
+$(rhythmbox_interface_idl_sources): Rhythmbox.idl
+	$(ORBIT_IDL) -I $(LIBBONOBO_IDL) -I $(BONOBO_ACTIVATION_IDL) Rhythmbox.idl
+
+BUILT_SOURCES = $(rhythmbox_interface_idl_sources)
+
+EXTRA_DIST = Rhythmbox.idl

data/Makefile.am

@@ -3,6 +3,9 @@ SUBDIRS = ui art glade node-views
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_DESKTOP_RULE@
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = rhythmbox.pc
+
 server_in_files = GNOME_Rhythmbox.server.in
 server_DATA = GNOME_Rhythmbox.server
 serverdir = $(libdir)/bonobo/servers

shell/Makefile.am

@@ -15,14 +15,7 @@ tab_files = AUTHORS.tab MAINTAINERS.tab DOCUMENTERS.tab
 
 bin_PROGRAMS = rhythmbox 
 
-rhythmbox_interface_idl_sources =      		\
-	Rhythmbox-common.c	     			\
-	Rhythmbox-stubs.c	     			\
-	Rhythmbox-skels.c	     			\
-	Rhythmbox.h
-
 rhythmbox_SOURCES =              			\
-	$(rhythmbox_interface_idl_sources) 		\
 	main.c						\
 	rb-shell.c					\
 	rb-shell.h					\
@@ -47,6 +40,7 @@ rhythmbox_LDADD =					\
 	$(top_builddir)/sources/libsourcesimpl.la	\
 	$(top_builddir)/library/librblibrary.la	        \
 	$(top_builddir)/iradio/librbiradio.la	        \
+	$(top_builddir)/corba/librbcorba.la	        \
 	$(RHYTHMBOX_LIBS)
 
 rhythmbox_LDFLAGS = -export-dynamic
@@ -59,6 +53,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)/lib/widgets                    	\
 	-I$(top_srcdir)/lib/toolbar                    	\
 	-I$(top_srcdir)/sources                    	\
+	-I$(top_srcdir)/corba                    	\
 	-I$(top_srcdir)/iradio                    	\
 	-I$(top_srcdir)/library                    	\
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
@@ -70,18 +65,6 @@ INCLUDES = 						\
 
 CLEAN_FILES = $(rhythmbox_interface_idl_sources)
 
-$(rhythmbox_interface_idl_sources): Rhythmbox.idl
-	$(ORBIT_IDL) -I $(LIBBONOBO_IDL) -I $(BONOBO_ACTIVATION_IDL) $(srcdir)/Rhythmbox.idl
-
-BUILT_SOURCES = $(rhythmbox_interface_idl_sources) $(tab_files)
-
-EXTRA_DIST = Rhythmbox.idl
-
-CLEANFILES =			\
-	AUTHORS.tab		\
-	MAINTAINERS.tab		\
-	Rhythmbox-common.c	\
-	Rhythmbox-stubs.c	\
-	Rhythmbox-skels.c	\
-	Rhythmbox.h
+BUILT_SOURCES = $(tab_files)
 
+CLEANFILES = AUTHORS.tab MAINTAINERS.tab