diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
commit | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (patch) | |
tree | c191578379fbc693b0616b4fd933f8f3322d4dd2 /src/Makefile.am | |
parent | 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd (diff) | |
parent | 2b263049bd152504227c9ade7e7b6e17cbc95f11 (diff) | |
download | gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.gz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.bz2 gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.lz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.xz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.zst gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.zip |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-accounts.c
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ef7af74fa..01de664b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,6 +59,11 @@ empathy_accounts_SOURCES = \ empathy-accounts.c empathy-accounts.h \ $(NULL) +empathy_accounts_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(CHEESE_CFLAGS) \ + $(NULL) + empathy_accounts_LDADD = \ $(LDADD) \ libempathy-accounts-common.la \ |