diff options
| author | infirit <[email protected]> | 2014-11-23 13:46:55 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-23 13:46:55 +0100 |
| commit | 24e90fe2904ea0783562e64ef6981fc83373604f (patch) | |
| tree | d1bf6a9181f77e2b45265a614257f30f93c685bd | |
| parent | 1acfcdf8da5da1d96ba7f9332f5c857c5b9d42fc (diff) | |
| download | mate-panel-24e90fe2904ea0783562e64ef6981fc83373604f.tar.bz2 mate-panel-24e90fe2904ea0783562e64ef6981fc83373604f.tar.xz | |
gir: Require g-i 0.9.5 and stop using deprecated --strip-prefix option
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libmate-panel-applet/Makefile.am | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 56be8ca1..36a18ef6 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) MATE_COMPILE_WARNINGS(maximum) # Check for introspection -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE='%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am index a718e373..44996055 100644 --- a/libmate-panel-applet/Makefile.am +++ b/libmate-panel-applet/Makefile.am @@ -121,9 +121,7 @@ MatePanelApplet_4_0_gir_INCLUDES = GObject-2.0 Gtk-$(GTK_API_VERSION) Gio-2.0 MatePanelApplet_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(srcdir) MatePanelApplet_4_0_gir_LIBS = libmate-panel-applet-4.la MatePanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources)) -# When requiring gobject-introspection 0.9.5, use this: -#MatePanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libmatepanelapplet-4.0 -MatePanelApplet_4_0_gir_SCANNERFLAGS = --strip-prefix=MatePanel --pkg-export=libmatepanelapplet-4.0 +MatePanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=MatePanel --symbol-prefix=mate-panel --pkg-export=libmatepanelapplet-4.0 INTROSPECTION_GIRS += MatePanelApplet-4.0.gir girdir = $(INTROSPECTION_GIRDIR) |