isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust to new Meta.typelib/Meta.gir locations

Browse Source 
Also put all our GI data in the private $(pkglibdir).

svn path=/trunk/; revision=100
This commit is contained in:
Colin Walters 2008-12-01 20:42:56 +00:00
parent b535a8949b
commit 9c21ce3eb5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -8,6 +8,7 @@ gnome_shell_cflags = \
$(MUTTER_PLUGIN_CFLAGS) \ $(MUTTER_PLUGIN_CFLAGS) \
-Itray \ -Itray \
-DGETTEXT_PACKAGE=gnome-shell \ -DGETTEXT_PACKAGE=gnome-shell \
-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
-DJSDIR=\"$(pkgdatadir)/js\" -DJSDIR=\"$(pkgdatadir)/js\"
plugindir = $(libdir)/metacity/plugins/clutter plugindir = $(libdir)/metacity/plugins/clutter
@ -63,13 +64,14 @@ libgnome_shell_la_LIBADD = \
libtray.la libtray.la
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
typelibdir = $(pkglibdir)/girepository typelibdir = $(pkglibdir)
typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib
Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la Makefile Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la Makefile
$(G_IR_SCANNER) \ $(G_IR_SCANNER) \
--namespace=Shell \ --namespace=Shell \
--nsversion=0.1 \ --nsversion=0.1 \
--add-include-path=$(libdir)/metacity/ \
--include=Clutter-0.8 \ --include=Clutter-0.8 \
--include=Meta-2.25 \ --include=Meta-2.25 \
--program=metacity \ --program=metacity \
@ -82,7 +84,7 @@ CLEANFILES += Shell-1.0.gir
# The dependency on libgnome-shell.la here is because g-ir-compiler opens it # The dependency on libgnome-shell.la here is because g-ir-compiler opens it
# (not the fake library, since we've already done the rewriting) # (not the fake library, since we've already done the rewriting)
Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@ LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler --includedir=$(libdir)/metacity/ Shell-0.1.gir -o $@
CLEANFILES += Shell-1.0.typelib CLEANFILES += Shell-1.0.typelib
Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile
@ -100,4 +102,4 @@ CLEANFILES += Tidy-1.0.gir
Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Tidy-1.0.gir -o $@ LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Tidy-1.0.gir -o $@
CLEANFILES += Tidy-1.0.typelib CLEANFILES += Tidy-1.0.typelib

3
src/gnome-shell-plugin.c
View File

@ -33,6 +33,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gjs/gjs.h> #include <gjs/gjs.h>
#include <girepository.h>
#include <gmodule.h> #include <gmodule.h>
#include <string.h> #include <string.h>
@ -122,6 +123,8 @@ do_init (const char *params)
} }
} }
g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
shell_js = g_getenv("GNOME_SHELL_JS"); shell_js = g_getenv("GNOME_SHELL_JS");
if (!shell_js) if (!shell_js)
shell_js = JSDIR; shell_js = JSDIR;