diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
| commit | 84e30dab1428affe335ef904377d07f8b5fdeb66 (patch) | |
| tree | fee9c8ec124a2b5804f6bb4ee31772db56a6e374 /libempathy/Makefile.am | |
| parent | fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff) | |
| parent | 3803736b4326d4bc00d58ccd25f910907f0b4521 (diff) | |
| download | gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2 gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip | |
Merge back from master
Diffstat (limited to 'libempathy/Makefile.am')
| -rw-r--r-- | libempathy/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index cdaa144fc..5fe4a9df7 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"empathy\" \ $(LIBEMPATHY_CFLAGS) \ $(GEOCLUE_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ + $(CONNMAN_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -31,6 +32,7 @@ libempathy_la_SOURCES = \ empathy-chatroom-manager.c \ empathy-call-factory.c \ empathy-call-handler.c \ + empathy-connectivity.c \ empathy-contact.c \ empathy-contact-groups.c \ empathy-contact-list.c \ @@ -70,7 +72,8 @@ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBEMPATHY_LIBS) \ $(GEOCLUE_LIBS) \ - $(NETWORK_MANAGER_LIBS) + $(NETWORK_MANAGER_LIBS) \ + $(CONNMAN_LIBS) libempathy_la_LDFLAGS = \ -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} \ @@ -84,6 +87,7 @@ libempathy_headers = \ empathy-chatroom-manager.h \ empathy-call-factory.h \ empathy-call-handler.h \ + empathy-connectivity.h \ empathy-contact.h \ empathy-contact-groups.h \ empathy-contact-list.h \ |