diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-03-28 19:32:45 +0800 |
|---|---|---|
| committer | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-01 18:23:44 +0800 |
| commit | 15460fa9ae4e6a19e8b6e971014deb50746d90ee (patch) | |
| tree | 18db9db5b9ea32420080dcc8b8332f4998f9d365 /ubuntu-online-accounts | |
| parent | 5c440c4e08f8102a9b73244697e69ad4855dbdef (diff) | |
| download | gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.gz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.bz2 gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.lz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.xz gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.zst gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.zip | |
Use a flat namespace for internal includes
Directly add the libempathy, libempathy-gtk and extensions directories
to the include search path. This decouples header inclusions from their
location and helps when reorganizing the source files layout.
https://bugzilla.gnome.org/show_bug.cgi?id=696950
Diffstat (limited to 'ubuntu-online-accounts')
5 files changed, 8 insertions, 7 deletions
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am index f76c2fa53..1271f6ec3 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR) INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(UOA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c index 9c2da5af4..d6713f286 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c @@ -30,7 +30,7 @@ #include <libaccounts-glib/ag-service.h> #include <libaccounts-glib/ag-account-service.h> -#include "libempathy-gtk/empathy-account-widget.h" +#include "empathy-account-widget.h" G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX) diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c index f49d0fc83..1f322ec52 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c @@ -22,8 +22,8 @@ #include "empathy-accounts-plugin.h" -#include "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-uoa-utils.h" +#include "empathy-client-factory.h" +#include "empathy-uoa-utils.h" #include "empathy-accounts-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c index 7e1a5f206..6895a04d5 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c @@ -27,8 +27,8 @@ #include <libaccounts-glib/ag-manager.h> #include <libaccounts-glib/ag-provider.h> -#include "libempathy/empathy-contact.h" -#include "libempathy-gtk/empathy-user-info.h" +#include "empathy-contact.h" +#include "empathy-user-info.h" #include "empathy-app-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c index 5bbf53db5..c22c6d59b 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c @@ -22,7 +22,7 @@ #include "empathy-app-plugin.h" -#include "libempathy/empathy-client-factory.h" +#include "empathy-client-factory.h" #include "empathy-app-plugin-widget.h" |