diff options
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/Makefile.am | 5 | ||||
-rw-r--r-- | libempathy/empathy-auth-factory.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-chatroom.h | 2 | ||||
-rw-r--r-- | libempathy/empathy-server-sasl-handler.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-server-tls-handler.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-utils.c | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 1cbd661c7..5f4059f20 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -2,8 +2,7 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/extensions \ -I$(top_builddir) \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ @@ -199,7 +198,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile --fhead "G_BEGIN_DECLS\n\n" \ --ftail "G_END_DECLS\n\n" \ --ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \ - --fprod '#include "libempathy/@filename@"\n' \ + --fprod '#include "@filename@"\n' \ --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ $(libempathy_headers) ) > xgen-gth \ diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index b2f2b802f..92a59dab2 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -38,7 +38,7 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions/extensions.h" +#include "extensions.h" G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT); diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 48e895841..6701e568f 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -26,7 +26,7 @@ #include <telepathy-glib/telepathy-glib.h> -#include "libempathy/empathy-tp-chat.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index 16aaa6bb1..b9b908ed7 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -21,7 +21,7 @@ #include "empathy-server-sasl-handler.h" -#include "extensions/extensions.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index d58155f58..78be2f0a7 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -26,7 +26,7 @@ #include "empathy-debug.h" #include "empathy-utils.h" -#include "extensions/extensions.h" +#include "extensions.h" static void async_initable_iface_init (GAsyncInitableIface *iface); diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b6fd9ce13..f62d1e5f0 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -37,7 +37,7 @@ #include "empathy-utils.h" #include "empathy-presence-manager.h" -#include "extensions/extensions.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" |