Commit fdae502d authored by Cosimo Cecchi's avatar Cosimo Cecchi

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
parent d9331ae9
......@@ -14,7 +14,7 @@ m4_define(exempi_minver, 1.99.5)
dnl 1. If the library code has changed at all since last release, then increment revision.
dnl 2. If any interfaces have been added, then increment current and set revision to 0.
dnl Interface break is not allowed.
m4_define(nautilus_extension_current, 3)
m4_define(nautilus_extension_current, 4)
m4_define(nautilus_extension_revision, 0)
AC_INIT(nautilus, 2.91.3, http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus)
......
......@@ -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)
......
......@@ -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}/..
......@@ -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
......
......@@ -16,7 +16,7 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-2.0"\" \
-DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
$(NULL)
BUILT_SOURCES = \
......
......@@ -9,7 +9,7 @@ INCLUDES=\
-DDATADIR=\""$(datadir)"\" \
$(NULL)
nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0
nautilus_extension_LTLIBRARIES = libnautilus-sendto.la
libnautilus_sendto_la_SOURCES = \
nautilus-nste.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment