jeena/gnome-contacts
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Clean up and separate VAPI files.

Browse source 
Note to other developers: you might have to do `make clean;./autogen.sh`
after this commit.

* Use a GtkCheese namespace to be constistent with other vapi's (such as
GtkClutter).

* Put each library in a separate vapi-file (this will come in handy when
porting to Meson).

* Clean up config.vapi:
  * get rid of unused CCode prefix-attribute (removes warning)
  * be consistent with braces
This commit is contained in:
Niels De Graef 2017-06-30 12:34:10 +02:00
parent 44f21d6ff1
commit d4dbd4374f
8 changed files with 82 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -44,8 +44,7 @@ pkg_modules="gtk+-3.0 >= 3.20.0
"
PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
CONTACTS_PACKAGES="--pkg gtk+-3.0 --pkg gio-2.0 --pkg gio-unix-2.0 --pkg folks --pkg folks-telepathy --pkg folks-eds --pkg clutter-1.0 --pkg clutter-gtk-1.0 --pkg champlain-0.12 --pkg geocode-glib-1.0"
AC_SUBST(CONTACTS_PACKAGES)
CONTACTS_PACKAGES="--pkg gtk+-3.0 --pkg gio-2.0 --pkg gio-unix-2.0 --pkg gnome-desktop-3.0 --pkg folks --pkg folks-telepathy --pkg folks-eds --pkg clutter-1.0 --pkg clutter-gtk-1.0 --pkg champlain-0.12 --pkg geocode-glib-1.0"
# Optional dependency for the user accounts panel
AC_ARG_WITH([cheese],
@ -56,6 +55,7 @@ if test x"$with_cheese" != x"no" ; then
PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.3.91 cheese, [have_cheese=yes], [have_cheese=no])
if test x${have_cheese} = xyes; then
AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
CONTACTS_PACKAGES+=" --pkg cheese --pkg cheese-gtk"
fi
if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
AC_MSG_ERROR([Cheese configured but not found])
@ -65,6 +65,9 @@ else
fi
AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
AC_SUBST(CONTACTS_PACKAGES)
#############
# Resources #
#############