diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-03 13:47:59 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-03 13:49:36 +0100 |
| commit | fdae502d65f3c40dee4d418bd9d21270940aa93d (patch) | |
| tree | 25ca03893f595a2ca7a683b239bf040adff066ee /libnautilus-extension | |
| parent | d9331ae959593cd81f59b39d61597278162ac7eb (diff) | |
| download | nautilus-fdae502d65f3c40dee4d418bd9d21270940aa93d.tar.gz | |
libnautilus-extension: use a different directory for 3.0
So that old extensions do not pull in GTK+2 code.
https://bugzilla.gnome.org/show_bug.cgi?id=624244
Diffstat (limited to 'libnautilus-extension')
| -rw-r--r-- | libnautilus-extension/Makefile.am | 12 | ||||
| -rw-r--r-- | libnautilus-extension/libnautilus-extension-uninstalled.pc.in | 4 | ||||
| -rw-r--r-- | libnautilus-extension/libnautilus-extension.pc.in | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am index 7db831d91..9d8301474 100644 --- a/libnautilus-extension/Makefile.am +++ b/libnautilus-extension/Makefile.am @@ -68,15 +68,15 @@ if HAVE_INTROSPECTION introspection_files = \ $(libnautilus_extension_include_HEADERS) \ $(libnautilus_extension_la_SOURCES) -Nautilus-2.0.gir: libnautilus-extension.la Makefile -Nautilus_2_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0 -Nautilus_2_0_gir_CFLAGS = \ +Nautilus-3.0.gir: libnautilus-extension.la Makefile +Nautilus_3_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0 +Nautilus_3_0_gir_CFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(BASE_CFLAGS) -Nautilus_2_0_gir_LIBS = libnautilus-extension.la -Nautilus_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) -INTROSPECTION_GIRS += Nautilus-2.0.gir +Nautilus_3_0_gir_LIBS = libnautilus-extension.la +Nautilus_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +INTROSPECTION_GIRS += Nautilus-3.0.gir girdir = $(datadir)/gir-1.0/ gir_DATA = $(INTROSPECTION_GIRS) diff --git a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in index f0bcdc17c..eee6aae81 100644 --- a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in +++ b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in @@ -2,11 +2,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -extensiondir=@libdir@/nautilus/extensions-2.0 +extensiondir=@libdir@/nautilus/extensions-3.0 Name: libnautilus-extension Description: A library to create Nautilus view extensions Version: @VERSION@ -Requires: glib-2.0 gtk+-3.0 +Requires: glib-2.0 gio-2.0 gtk+-3.0 Libs: ${pc_top_builddir}/${pcfiledir}/libnautilus-extension.la Cflags: -I${pc_top_builddir}/${pcfiledir}/.. diff --git a/libnautilus-extension/libnautilus-extension.pc.in b/libnautilus-extension/libnautilus-extension.pc.in index 65f8e4b8c..1da35854e 100644 --- a/libnautilus-extension/libnautilus-extension.pc.in +++ b/libnautilus-extension/libnautilus-extension.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -extensiondir=@libdir@/nautilus/extensions-2.0 +extensiondir=@libdir@/nautilus/extensions-3.0 Name: libnautilus-extension Description: A library to create Nautilus view extensions |