diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-08 20:35:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-08 20:35:53 +0800 |
| commit | 0637683a2f89087f49fa0d91e44b04ed26d72ba3 (patch) | |
| tree | 7f0d367d965831cc45b3091d28b7fdee8ebb011f /libempathy | |
| parent | 526cac765322aa7516d46d735fc9b5f1c4f2c228 (diff) | |
| parent | 6b1d4251dc32cf7c75871002a1f8163af9775f65 (diff) | |
| download | gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar.gz gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar.bz2 gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar.lz gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar.xz gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.tar.zst gsoc2013-empathy-0637683a2f89087f49fa0d91e44b04ed26d72ba3.zip | |
Merge branch 'gtk3-621753'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index d44d8afef..746803e05 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ -DG_LOG_DOMAIN=\"empathy\" \ - $(LIBEMPATHY_CFLAGS) \ + $(EMPATHY_CFLAGS) \ $(GEOCLUE_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ $(CONNMAN_CFLAGS) \ @@ -100,7 +100,7 @@ nodist_libempathy_la_SOURCES =\ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ - $(LIBEMPATHY_LIBS) \ + $(EMPATHY_LIBS) \ $(GEOCLUE_LIBS) \ $(NETWORK_MANAGER_LIBS) \ $(CONNMAN_LIBS) |