diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libmenu/Makefile.am | 10 | ||||
| -rw-r--r-- | libmenu/libmate-menu-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | libmenu/libmate-menu.pc.in | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index fb346a4..04d10bc 100644 --- a/configure.ac +++ b/configure.ac @@ -35,9 +35,9 @@ AC_STDC_HEADERS AC_ARG_PROGRAM AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) +PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.50.0) +AC_SUBST(GIO_UNIX_CFLAGS) +AC_SUBST(GIO_UNIX_LIBS) MATE_COMPILE_WARNINGS(yes) diff --git a/libmenu/Makefile.am b/libmenu/Makefile.am index 3d06096..e6e20e7 100644 --- a/libmenu/Makefile.am +++ b/libmenu/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES = libmate-menu.la AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \ $(DISABLE_DEPRECATED_CFLAGS) \ $(DEBUG_CFLAGS) @@ -32,7 +32,7 @@ libmate_menu_la_SOURCES = \ menu-util.h libmate_menu_la_LIBADD = \ - $(GLIB_LIBS) + $(GIO_UNIX_LIBS) libmate_menu_la_LDFLAGS = \ -version-info $(LIB_MENU_LT_VERSION) \ @@ -56,13 +56,13 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION # Note: we only include the headers here so far because there's no gtk-doc at all anyway -introspection_sources = $(libmate_menu_include_HEADERS) +introspection_sources = $(libmate_menu_include_HEADERS) matemenu-tree.c MateMenu-2.0.gir: libmate-menu.la -MateMenu_2_0_gir_INCLUDES = GObject-2.0 +MateMenu_2_0_gir_INCLUDES = Gio-2.0 MateMenu_2_0_gir_CFLAGS = $(AM_CPPFLAGS) MateMenu_2_0_gir_LIBS = libmate-menu.la -MateMenu_2_0_gir_SCANNERFLAGS = --pkg-export=libmate-menu +MateMenu_2_0_gir_SCANNERFLAGS = --identifier-prefix=MateMenu --symbol-prefix=matemenu --pkg-export=libmate-menu --c-include=matemenu-tree.h MateMenu_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) INTROSPECTION_GIRS += MateMenu-2.0.gir diff --git a/libmenu/libmate-menu-uninstalled.pc.in b/libmenu/libmate-menu-uninstalled.pc.in index e0b0496..87653f8 100644 --- a/libmenu/libmate-menu-uninstalled.pc.in +++ b/libmenu/libmate-menu-uninstalled.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libmate-menu Description: Desktop Menu Specification Implementation -Requires: glib-2.0 +Requires: gio-unix-2.0 Version: @VERSION@ Libs: ${pc_top_builddir}/${pcfiledir}/libmate-menu.la Cflags: -I${pc_top_builddir}/${pcfiledir} diff --git a/libmenu/libmate-menu.pc.in b/libmenu/libmate-menu.pc.in index ab593d2..ab2b883 100644 --- a/libmenu/libmate-menu.pc.in +++ b/libmenu/libmate-menu.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libmate-menu Description: Desktop Menu Specification Implementation -Requires: glib-2.0 +Requires: gio-unix-2.0 Version: @VERSION@ Libs: -L${libdir} -lmate-menu Cflags: -I${includedir}/mate-menus |