Skip to content

Commit edaad52

Browse files
yetistraveit65
authored andcommitted
require gio-unix
1 parent 2b06561 commit edaad52

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ AC_STDC_HEADERS
3535
AC_ARG_PROGRAM
3636
AM_PROG_LIBTOOL
3737

38-
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.50.0 gio-2.0 >= 2.50.0)
39-
AC_SUBST(GLIB_CFLAGS)
40-
AC_SUBST(GLIB_LIBS)
38+
PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.50.0)
39+
AC_SUBST(GIO_UNIX_CFLAGS)
40+
AC_SUBST(GIO_UNIX_LIBS)
4141

4242
MATE_COMPILE_WARNINGS(yes)
4343

libmenu/Makefile.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
lib_LTLIBRARIES = libmate-menu.la
22

33
AM_CPPFLAGS = \
4-
$(GLIB_CFLAGS) \
4+
$(GIO_UNIX_CFLAGS) \
55
-DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \
66
$(DISABLE_DEPRECATED_CFLAGS) \
77
$(DEBUG_CFLAGS)
@@ -32,7 +32,7 @@ libmate_menu_la_SOURCES = \
3232
menu-util.h
3333

3434
libmate_menu_la_LIBADD = \
35-
$(GLIB_LIBS)
35+
$(GIO_UNIX_LIBS)
3636

3737
libmate_menu_la_LDFLAGS = \
3838
-version-info $(LIB_MENU_LT_VERSION) \
@@ -56,13 +56,13 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
5656

5757
if HAVE_INTROSPECTION
5858
# Note: we only include the headers here so far because there's no gtk-doc at all anyway
59-
introspection_sources = $(libmate_menu_include_HEADERS)
59+
introspection_sources = $(libmate_menu_include_HEADERS) matemenu-tree.c
6060

6161
MateMenu-2.0.gir: libmate-menu.la
62-
MateMenu_2_0_gir_INCLUDES = GObject-2.0
62+
MateMenu_2_0_gir_INCLUDES = Gio-2.0
6363
MateMenu_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
6464
MateMenu_2_0_gir_LIBS = libmate-menu.la
65-
MateMenu_2_0_gir_SCANNERFLAGS = --pkg-export=libmate-menu
65+
MateMenu_2_0_gir_SCANNERFLAGS = --identifier-prefix=MateMenu --symbol-prefix=matemenu --pkg-export=libmate-menu --c-include=matemenu-tree.h
6666
MateMenu_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
6767
INTROSPECTION_GIRS += MateMenu-2.0.gir
6868

libmenu/libmate-menu-uninstalled.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ includedir=@includedir@
55

66
Name: libmate-menu
77
Description: Desktop Menu Specification Implementation
8-
Requires: glib-2.0
8+
Requires: gio-unix-2.0
99
Version: @VERSION@
1010
Libs: ${pc_top_builddir}/${pcfiledir}/libmate-menu.la
1111
Cflags: -I${pc_top_builddir}/${pcfiledir}

libmenu/libmate-menu.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ includedir=@includedir@
55

66
Name: libmate-menu
77
Description: Desktop Menu Specification Implementation
8-
Requires: glib-2.0
8+
Requires: gio-unix-2.0
99
Version: @VERSION@
1010
Libs: -L${libdir} -lmate-menu
1111
Cflags: -I${includedir}/mate-menus

0 commit comments

Comments
 (0)