[empathy] tp-account-widgets: Move the IRC support sources with the account widget

[Marco Barisione <mbari src gnome org>]

commit e2c9efce03711a62db2eadc118fd2266da325d73
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Tue Mar 26 17:39:28 2013 +0100

    tp-account-widgets: Move the IRC support sources with the account widget
    
    To handle different networks and servers the IRC account widget uses
    many helper object and functions. Move them close to the IRC account
    widget sources.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699492

 libempathy/Makefile.am                             |    6 ------
 tests/Makefile.am                                  |    2 ++
 tp-account-widgets/Makefile.am                     |    9 +++++++--
 .../empathy-irc-network-manager.c                  |    0
 .../empathy-irc-network-manager.h                  |    0
 .../empathy-irc-network.c                          |    0
 .../empathy-irc-network.h                          |    0
 .../empathy-irc-server.c                           |    0
 .../empathy-irc-server.h                           |    0
 9 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 5f4059f..6759d9f 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -43,9 +43,6 @@ libempathy_headers =                          \
        empathy-gsettings.h                     \
        empathy-presence-manager.h                              \
        empathy-individual-manager.h            \
-       empathy-irc-network-manager.h           \
-       empathy-irc-network.h                   \
-       empathy-irc-server.h                    \
        empathy-keyring.h                       \
        empathy-location.h                      \
        empathy-message.h                       \
@@ -79,9 +76,6 @@ libempathy_handwritten_source =                               \
        empathy-ft-handler.c                            \
        empathy-presence-manager.c                                      \
        empathy-individual-manager.c                    \
-       empathy-irc-network-manager.c                   \
-       empathy-irc-network.c                           \
-       empathy-irc-server.c                            \
        empathy-keyring.c                               \
        empathy-message.c                               \
        empathy-pkg-kit.c               \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 67fe5d8..679aa55 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST =          \
 
 AM_CPPFLAGS =                                          \
        $(ERROR_CFLAGS)                                 \
+       -I$(top_srcdir)/tp-account-widgets              \
        -I$(top_srcdir)/libempathy                      \
        -I$(top_srcdir)/libempathy-gtk                  \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
@@ -21,6 +22,7 @@ AM_CPPFLAGS =                                         \
        $(NULL)
 
 LDADD =                                                                \
+       $(top_builddir)/tp-account-widgets/libtp-account-widgets.la     \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
        $(EMPATHY_LIBS)                                         \
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index c3a23a0..38a482e 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/flymake.mk
-
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)/libempathy                      \
@@ -25,6 +23,9 @@ libtp_account_widgets_sources =               \
        empathy-irc-network-chooser.c           \
        empathy-irc-network-chooser-dialog.c    \
        empathy-irc-network-dialog.c            \
+       empathy-irc-network-manager.c           \
+       empathy-irc-network.c                   \
+       empathy-irc-server.c                    \
        totem-subtitle-encoding.c               \
        $(NULL)
 
@@ -35,6 +36,10 @@ libtp_account_widgets_headers =                      \
        empathy-irc-network-chooser-dialog.h    \
        empathy-irc-network-chooser.h           \
        empathy-irc-network-dialog.h            \
+       empathy-irc-network-manager.h           \
+       empathy-irc-network.h                   \
+       empathy-irc-server.h                    \
+       empathy-utils.h                         \
        totem-subtitle-encoding.h               \
        $(NULL)
 
diff --git a/libempathy/empathy-irc-network-manager.c b/tp-account-widgets/empathy-irc-network-manager.c
similarity index 100%
rename from libempathy/empathy-irc-network-manager.c
rename to tp-account-widgets/empathy-irc-network-manager.c
diff --git a/libempathy/empathy-irc-network-manager.h b/tp-account-widgets/empathy-irc-network-manager.h
similarity index 100%
rename from libempathy/empathy-irc-network-manager.h
rename to tp-account-widgets/empathy-irc-network-manager.h
diff --git a/libempathy/empathy-irc-network.c b/tp-account-widgets/empathy-irc-network.c
similarity index 100%
rename from libempathy/empathy-irc-network.c
rename to tp-account-widgets/empathy-irc-network.c
diff --git a/libempathy/empathy-irc-network.h b/tp-account-widgets/empathy-irc-network.h
similarity index 100%
rename from libempathy/empathy-irc-network.h
rename to tp-account-widgets/empathy-irc-network.h
diff --git a/libempathy/empathy-irc-server.c b/tp-account-widgets/empathy-irc-server.c
similarity index 100%
rename from libempathy/empathy-irc-server.c
rename to tp-account-widgets/empathy-irc-server.c
diff --git a/libempathy/empathy-irc-server.h b/tp-account-widgets/empathy-irc-server.h
similarity index 100%
rename from libempathy/empathy-irc-server.h
rename to tp-account-widgets/empathy-irc-server.h