diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-15 21:14:08 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-15 21:14:08 +0800 |
commit | 4a8508f3b3a0c595add6908188a9a3e9c46c509a (patch) | |
tree | 70e73c094dda21cb867bb425e7b62b6fe7d36ad7 /libempathy-gtk | |
parent | 2a549bda5cbe7972fe496a9e02d6a9911214205c (diff) | |
parent | 8d93b865c03829043b17010bc2bd7e3a89dbfb69 (diff) | |
download | gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar.gz gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar.bz2 gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar.lz gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar.xz gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.tar.zst gsoc2013-empathy-4a8508f3b3a0c595add6908188a9a3e9c46c509a.zip |
Merge remote branch 'zdra/configure'
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index def25e357..a28ac9a00 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -8,14 +8,10 @@ AM_CPPFLAGS = \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ $(EMPATHY_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(CANBERRA_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) \ - $(GCR_CFLAGS) \ - $(MEEGO_CFLAGS) \ + $(MEEGO_CFLAGS) \ $(WEBKIT_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) |