Switch sugarext to be an introspectable library

This makes sugarext accessible through introspection. It is used
from the shell (key grabber, sound volume management) and the
shell session management.

1 files changed, 57 insertions, 42 deletions

diff --git a/src/sugar3/Makefile.am b/src/sugar3/Makefile.am
index a66b741..e0eb935 100644
--- a/src/sugar3/Makefile.am
+++ b/src/sugar3/Makefile.am
@@ -9,68 +9,51 @@ sugar_PYTHON =		\
 	util.py		\
 	wm.py
 
-pkgpyexecdir = $(pythondir)/sugar3
+lib_LTLIBRARIES = libsugarext.la
 
-pkgpyexec_LTLIBRARIES = _sugarext.la
-
-_sugarext_la_CFLAGS = 		\
+libsugarext_la_CFLAGS = 		\
 	-DHAVE_ALSA		\
-        $(WARN_CFLAGS)		\
-	$(EXT_CFLAGS)		\
-	$(PYTHON_INCLUDES)
+	$(EXT_CFLAGS)	\
+	$(WARN_CFLAGS)
 
-_sugarext_la_LDFLAGS = -module -avoid-version
-_sugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE
+libsugarext_la_LDFLAGS = $(LDADD)
+libsugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE -lasound
 
-_sugarext_la_SOURCES =			\
+libsugarext_la_SOURCES =		\
 	$(BUILT_SOURCES)		\
-	_sugarextmodule.c		\
-	acme-volume.h			\
-	acme-volume.c			\
-	acme-volume-alsa.h		\
 	acme-volume-alsa.c		\
-        gsm-app.h			\
-	gsm-app.c			\
-	gsm-client.h			\
-	gsm-client.c			\
-	gsm-client-xsmp.h		\
-	gsm-client-xsmp.c		\
-	gsm-xsmp.h			\
-	gsm-xsmp.c			\
-	gsm-session.h			\
-	gsm-session.c			\
+	acme-volume-alsa.h		\
+	acme-volume.c			\
+	acme-volume.h			\
 	eggaccelerators.c		\
 	eggaccelerators.h		\
-	eggdesktopfile.h		\
 	eggdesktopfile.c		\
-	eggsmclient.h			\
+	eggdesktopfile.h		\
 	eggsmclient.c			\
+	eggsmclient.h			\
 	eggsmclient-private.h		\
 	eggsmclient-xsmp.c		\
+	gsm-app.c			\
+	gsm-app.h			\
+	gsm-client.c			\
+	gsm-client.h			\
+	gsm-client-xsmp.c		\
+	gsm-client-xsmp.h		\
+	gsm-session.c			\
+	gsm-session.h			\
+	gsm-xsmp.c			\
+	gsm-xsmp.h			\
 	sugar-grid.c			\
 	sugar-grid.h			\
 	sugar-key-grabber.c		\
 	sugar-key-grabber.h		\
-	sugar-menu.h			\
-	sugar-menu.c
+	sugar-menu.c			\
+	sugar-menu.h
 
 BUILT_SOURCES = 			\
-	_sugarext.c			\
 	sugar-marshal.c			\
 	sugar-marshal.h
 
-_sugarext.c: _sugarext.defs _sugarext.override
-
-.defs.c:
-	(cd $(srcdir)\
-	 && $(PYGTK_CODEGEN) \
-	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
-	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
-	    --override $*.override \
-	    --prefix py$* $*.defs) > gen-$*.c \
-	&& cp gen-$*.c $*.c \
-	&& rm -f gen-$*.c
-
 sugar-marshal.c: sugar-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=sugar_marshal \
 		$(srcdir)/sugar-marshal.list --header --body > sugar-marshal.c
@@ -80,4 +63,36 @@ sugar-marshal.h: sugar-marshal.list
 		$(srcdir)/sugar-marshal.list --header > sugar-marshal.h
 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = sugar-marshal.list _sugarext.defs _sugarext.override
+EXTRA_DIST = sugar-marshal.list
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS = SugarExt-1.0.gir
+INTROSPECTION_SCANNER_ARGS = --identifier-prefix=Sugar --symbol-prefix=sugar \
+	--identifier-prefix=EggSM --symbol-prefix=egg_sm \
+	--identifier-prefix=Gsm --symbol-prefix=gsm \
+	--identifier-prefix=Acme --symbol-prefix=acme
+SugarExt_1_0_gir_LIBS = libsugarext.la
+SugarExt_1_0_gir_FILES = \
+	acme-volume.c \
+	acme-volume.h \
+	acme-volume-alsa.c \
+	acme-volume-alsa.h \
+	eggsmclient.c \
+	eggsmclient.h \
+	gsm-session.c \
+	gsm-session.h \
+	gsm-xsmp.c \
+	gsm-xsmp.h \
+	sugar-key-grabber.c \
+	sugar-key-grabber.h
+SugarExt_1_0_gir_INCLUDES = Gtk-3.0 Gdk-3.0
+SugarExt_1_0_gir_PACKAGES = gtk+-3.0 gdk-3.0
+SugarExt_1_0_gir_EXPORT_PACKAGES = SugarExt-1.0
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = SugarExt-1.0.gir
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = SugarExt-1.0.typelib
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)