GNOME.org
 

[rhythmbox/gobject-introspection: 9/34] move gi stuff under bindings/

commit d27563512ddb27bfb4c94f498365fde9e4bd235b
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Jul 9 22:24:51 2010 +1000

    move gi stuff under bindings/
    
    might help with build order a bit, maybe make gir->vapi possible some day

 Makefile.am             |    2 +-
 bindings/Makefile.am    |    4 ++
 bindings/gi/Makefile.am |  134 +++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac            |    1 +
 shell/Makefile.am       |  129 ---------------------------------------------
 5 files changed, 140 insertions(+), 130 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bf7d364..54a80b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
 SUBDIRS = macros lib metadata rhythmdb widgets sources podcast \
-	backends bindings shell plugins remote data po help tests doc
+	backends shell bindings plugins remote data po help tests doc
 
 EXTRA_DIST = 			\
 	autogen.sh		\
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index da5fc80..e3f9159 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -3,3 +3,7 @@ SUBDIRS =
 if ENABLE_VALA
 SUBDIRS += vala
 endif
+
+if HAVE_INTROSPECTION
+SUBDIRS += gi
+endif
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
new file mode 100644
index 0000000..5390452
--- /dev/null
+++ b/bindings/gi/Makefile.am
@@ -0,0 +1,134 @@
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir) --add-include-path=$(top_builddir)/shell
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) --includedir=$(top_builddir)/shell
+
+rb_introspection_sources = \
+		backends/rb-encoder.h \
+		backends/rb-encoder.c \
+		backends/rb-player-gst-filter.h \
+		backends/rb-player-gst-filter.c \
+		backends/rb-player-gst-tee.h \
+		backends/rb-player-gst-tee.c \
+		backends/rb-player.h \
+		backends/rb-player.c \
+		lib/rb-builder-helpers.h \
+		lib/rb-builder-helpers.c \
+		lib/rb-debug.h \
+		lib/rb-debug.c \
+		lib/rb-file-helpers.h \
+		lib/rb-file-helpers.c \
+		lib/rb-preferences.h \
+		lib/rb-stock-icons.h \
+		lib/rb-stock-icons.c \
+		lib/rb-util.h \
+		lib/rb-util.c \
+		lib/libmediaplayerid/mediaplayerid.h \
+		lib/libmediaplayerid/mpid-device.c \
+		metadata/rb-metadata.h \
+		metadata/rb-metadata-dbus-client.c \
+		podcast/rb-podcast-manager.h \
+		podcast/rb-podcast-manager.c \
+		podcast/rb-podcast-parse.h \
+		podcast/rb-podcast-parse.c \
+		shell/rb-shell.h \
+		shell/rb-shell.c \
+		shell/rb-shell-player.h \
+		shell/rb-shell-player.c \
+		shell/rb-shell-preferences.h \
+		shell/rb-shell-preferences.c \
+		shell/rb-playlist-manager.h \
+		shell/rb-playlist-manager.c \
+		shell/rb-removable-media-manager.h \
+		shell/rb-removable-media-manager.c \
+		shell/rb-history.h \
+		shell/rb-history.c \
+		shell/rb-play-order.h \
+		shell/rb-play-order.c \
+		shell/rb-plugin.h \
+		shell/rb-plugin.c \
+		sources/rb-source.h \
+		sources/rb-source.c \
+		sources/rb-streaming-source.h \
+		sources/rb-streaming-source.c \
+		sources/rb-source-group.h \
+		sources/rb-source-group.c \
+		sources/rb-source-search.h \
+		sources/rb-source-search.c \
+		sources/rb-sourcelist.h \
+		sources/rb-sourcelist.c \
+		sources/rb-sourcelist-model.h \
+		sources/rb-sourcelist-model.c \
+		sources/rb-browser-source.h \
+		sources/rb-browser-source.c \
+		sources/rb-removable-media-source.h \
+		sources/rb-removable-media-source.c \
+		sources/rb-media-player-source.h \
+		sources/rb-media-player-source.c \
+		sources/rb-playlist-source.h \
+		sources/rb-playlist-source.c \
+		sources/rb-playlist-xml.h \
+		sources/rb-auto-playlist-source.h \
+		sources/rb-auto-playlist-source.c \
+		sources/rb-static-playlist-source.h \
+		sources/rb-static-playlist-source.c \
+		sources/rb-source-search-basic.h \
+		sources/rb-source-search-basic.c \
+		widgets/rb-entry-view.h \
+		widgets/rb-entry-view.c \
+		widgets/rb-property-view.h \
+		widgets/rb-property-view.c \
+		widgets/rb-dialog.h \
+		widgets/rb-dialog.c \
+		widgets/rb-cell-renderer-pixbuf.h \
+		widgets/rb-cell-renderer-pixbuf.c \
+		widgets/rb-cell-renderer-rating.h \
+		widgets/rb-cell-renderer-rating.c \
+		widgets/rb-rating.h \
+		widgets/rb-rating.c \
+		widgets/rb-library-browser.h \
+		widgets/rb-library-browser.c \
+		widgets/rb-segmented-bar.h \
+		widgets/rb-segmented-bar.c \
+		widgets/rb-song-info.h \
+		widgets/rb-song-info.c \
+		widgets/rb-uri-dialog.h \
+		widgets/rb-uri-dialog.c
+
+rhythmdb_introspection_sources = \
+		lib/rb-string-value-map.h \
+		lib/rb-string-value-map.c \
+		rhythmdb/rhythmdb.h \
+		rhythmdb/rhythmdb.c \
+		rhythmdb/rhythmdb-property-model.h \
+		rhythmdb/rhythmdb-property-model.c \
+		rhythmdb/rhythmdb-query-model.h \
+		rhythmdb/rhythmdb-query-model.c \
+		rhythmdb/rhythmdb-query-results.h \
+		rhythmdb/rhythmdb-query-results.c \
+		rhythmdb/rhythmdb-import-job.h \
+		rhythmdb/rhythmdb-import-job.c \
+		rhythmdb/rb-refstring.h \
+		rhythmdb/rb-refstring.c
+
+RhythmDB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
+RhythmDB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0
+RhythmDB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
+RhythmDB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
+RhythmDB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rhythmdb_introspection_sources))
+
+RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la RhythmDB-0.13.gir
+RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0 RhythmDB-0.13
+RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
+RB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
+RB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
+
+INTROSPECTION_GIRS += RhythmDB-0.13.gir RB-0.13.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+CLEANFILES = $(dist_gir_DATA) $(typelib_DATA)
diff --git a/configure.ac b/configure.ac
index 24ace4f..6087537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,6 +893,7 @@ plugins/mpris/Makefile
 bindings/Makefile
 bindings/python/Makefile
 bindings/vala/Makefile
+bindings/gi/Makefile
 help/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 86afe13..e2c4016 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -170,135 +170,6 @@ if ENABLE_PYTHON
 rhythmbox_LDADD += $(PYTHON_LIBS)
 endif
 
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
-
-if HAVE_INTROSPECTION
-introspection_sources = \
-		backends/rb-encoder.h \
-		backends/rb-encoder.c \
-		backends/rb-player-gst-filter.h \
-		backends/rb-player-gst-filter.c \
-		backends/rb-player-gst-tee.h \
-		backends/rb-player-gst-tee.c \
-		backends/rb-player.h \
-		backends/rb-player.c \
-		lib/rb-builder-helpers.h \
-		lib/rb-builder-helpers.c \
-		lib/rb-debug.h \
-		lib/rb-debug.c \
-		lib/rb-file-helpers.h \
-		lib/rb-file-helpers.c \
-		lib/rb-preferences.h \
-		lib/rb-stock-icons.h \
-		lib/rb-stock-icons.c \
-		lib/rb-string-value-map.h \
-		lib/rb-string-value-map.c \
-		lib/rb-util.h \
-		lib/rb-util.c \
-		lib/libmediaplayerid/mediaplayerid.h \
-		lib/libmediaplayerid/mpid-device.c \
-		metadata/rb-metadata.h \
-		metadata/rb-metadata-dbus-client.c \
-		podcast/rb-podcast-manager.h \
-		podcast/rb-podcast-manager.c \
-		podcast/rb-podcast-parse.h \
-		podcast/rb-podcast-parse.c \
-		rhythmdb/rb-refstring.h \
-		rhythmdb/rb-refstring.c \
-		rhythmdb/rhythmdb.h \
-		rhythmdb/rhythmdb.c \
-		rhythmdb/rhythmdb-property-model.h \
-		rhythmdb/rhythmdb-property-model.c \
-		rhythmdb/rhythmdb-query-model.h \
-		rhythmdb/rhythmdb-query-model.c \
-		rhythmdb/rhythmdb-query-results.h \
-		rhythmdb/rhythmdb-query-results.c \
-		rhythmdb/rhythmdb-import-job.h \
-		rhythmdb/rhythmdb-import-job.c \
-		shell/rb-shell.h \
-		shell/rb-shell.c \
-		shell/rb-shell-player.h \
-		shell/rb-shell-player.c \
-		shell/rb-shell-preferences.h \
-		shell/rb-shell-preferences.c \
-		shell/rb-playlist-manager.h \
-		shell/rb-playlist-manager.c \
-		shell/rb-removable-media-manager.h \
-		shell/rb-removable-media-manager.c \
-		shell/rb-history.h \
-		shell/rb-history.c \
-		shell/rb-play-order.h \
-		shell/rb-play-order.c \
-		shell/rb-plugin.h \
-		shell/rb-plugin.c \
-		sources/rb-source.h \
-		sources/rb-source.c \
-		sources/rb-streaming-source.h \
-		sources/rb-streaming-source.c \
-		sources/rb-source-group.h \
-		sources/rb-source-group.c \
-		sources/rb-source-search.h \
-		sources/rb-source-search.c \
-		sources/rb-sourcelist.h \
-		sources/rb-sourcelist.c \
-		sources/rb-sourcelist-model.h \
-		sources/rb-sourcelist-model.c \
-		sources/rb-browser-source.h \
-		sources/rb-browser-source.c \
-		sources/rb-removable-media-source.h \
-		sources/rb-removable-media-source.c \
-		sources/rb-media-player-source.h \
-		sources/rb-media-player-source.c \
-		sources/rb-playlist-source.h \
-		sources/rb-playlist-source.c \
-		sources/rb-playlist-xml.h \
-		sources/rb-auto-playlist-source.h \
-		sources/rb-auto-playlist-source.c \
-		sources/rb-static-playlist-source.h \
-		sources/rb-static-playlist-source.c \
-		sources/rb-source-search-basic.h \
-		sources/rb-source-search-basic.c \
-		widgets/rb-entry-view.h \
-		widgets/rb-entry-view.c \
-		widgets/rb-property-view.h \
-		widgets/rb-property-view.c \
-		widgets/rb-dialog.h \
-		widgets/rb-dialog.c \
-		widgets/rb-cell-renderer-pixbuf.h \
-		widgets/rb-cell-renderer-pixbuf.c \
-		widgets/rb-cell-renderer-rating.h \
-		widgets/rb-cell-renderer-rating.c \
-		widgets/rb-rating.h \
-		widgets/rb-rating.c \
-		widgets/rb-library-browser.h \
-		widgets/rb-library-browser.c \
-		widgets/rb-segmented-bar.h \
-		widgets/rb-segmented-bar.c \
-		widgets/rb-song-info.h \
-		widgets/rb-song-info.c \
-		widgets/rb-uri-dialog.h \
-		widgets/rb-uri-dialog.c
-
-Rhythmbox-0.13.gir: librhythmbox-core.la
-Rhythmbox_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-2.0 Gst-0.10 libxml2-2.0
-Rhythmbox_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I..
-Rhythmbox_0_13_gir_LIBS = librhythmbox-core.la
-Rhythmbox_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(introspection_sources))
-INTROSPECTION_GIRS += Rhythmbox-0.13.gir
-
-girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
-endif
-
-
-
 BUILT_SOURCES += $(tab_files)
 
 CLEANFILES += $(BUILT_SOURCES)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]