diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
| commit | 894b1f315b62499a5d305aff6b937093a20df1a4 (patch) | |
| tree | 8cecdaff46a2ee3360f9e676d11672c388a23082 /libempathy/Makefile.am | |
| parent | 58574c8dc2e5261d8c89b9a6b6fda41687a386ea (diff) | |
| parent | 1af2b9b657046268d0a44fd2aa588ea281ad1f20 (diff) | |
| download | gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.gz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.bz2 gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.lz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.xz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.zst gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.zip | |
Merge remote-tracking branch 'origin/call1' into master+call
Conflicts:
configure.ac
telepathy-yell
Diffstat (limited to 'libempathy/Makefile.am')
| -rw-r--r-- | libempathy/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 6a6e2ce7e..cc288bfa8 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"empathy\" \ -DGCR_API_SUBJECT_TO_CHANGE \ $(EMPATHY_CFLAGS) \ - $(YELL_CFLAGS) \ $(GEOCLUE_CFLAGS) \ $(GEOCODE_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ @@ -149,7 +148,6 @@ nodist_libempathy_la_SOURCES =\ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ - $(top_builddir)/telepathy-yell/telepathy-yell/libtelepathy-yell.la \ $(GCR_LIBS) \ $(EMPATHY_LIBS) \ $(GEOCLUE_LIBS) \ |