diff options
| -rw-r--r-- | libempathy/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tp-account-widgets/Makefile.am | 9 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-network-manager.c (renamed from libempathy/empathy-irc-network-manager.c) | 0 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-network-manager.h (renamed from libempathy/empathy-irc-network-manager.h) | 0 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-network.c (renamed from libempathy/empathy-irc-network.c) | 0 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-network.h (renamed from libempathy/empathy-irc-network.h) | 0 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-server.c (renamed from libempathy/empathy-irc-server.c) | 0 | ||||
| -rw-r--r-- | tp-account-widgets/empathy-irc-server.h (renamed from libempathy/empathy-irc-server.h) | 0 |
9 files changed, 9 insertions, 8 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 5f4059f20..6759d9f17 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 67fe5d895..679aa55e2 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 c3a23a009..38a482e1b 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 index 3f53a49ad..3f53a49ad 100644 --- a/libempathy/empathy-irc-network-manager.c +++ b/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 index 19df2f7e1..19df2f7e1 100644 --- a/libempathy/empathy-irc-network-manager.h +++ b/tp-account-widgets/empathy-irc-network-manager.h diff --git a/libempathy/empathy-irc-network.c b/tp-account-widgets/empathy-irc-network.c index e01116e96..e01116e96 100644 --- a/libempathy/empathy-irc-network.c +++ b/tp-account-widgets/empathy-irc-network.c diff --git a/libempathy/empathy-irc-network.h b/tp-account-widgets/empathy-irc-network.h index a298ced9a..a298ced9a 100644 --- a/libempathy/empathy-irc-network.h +++ b/tp-account-widgets/empathy-irc-network.h diff --git a/libempathy/empathy-irc-server.c b/tp-account-widgets/empathy-irc-server.c index 75eb016dd..75eb016dd 100644 --- a/libempathy/empathy-irc-server.c +++ b/tp-account-widgets/empathy-irc-server.c diff --git a/libempathy/empathy-irc-server.h b/tp-account-widgets/empathy-irc-server.h index d72af64ac..d72af64ac 100644 --- a/libempathy/empathy-irc-server.h +++ b/tp-account-widgets/empathy-irc-server.h |