/soc/2013/ankitkv/gobjectification: bfdad85c76e6: Build a single...

[Ankit Vani]

Changeset: bfdad85c76e61b19024bd1e81e1c54677f80ff3e
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-04 01:35 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/bfdad85c76e6

Description:

Build a single library for jabber.
Renamed lib{yahoo|yahoojp|ymsg}.[ch] to {yahoo|yahoojp|ymsg}.[ch].

diffstat:

 libpurple/protocols/yahoo/Makefile.am  |  35 ++++++++++++---------------------
 libpurple/protocols/yahoo/libyahoo.c   |   2 +-
 libpurple/protocols/yahoo/libyahoo.h   |   0 
 libpurple/protocols/yahoo/libyahoojp.c |   2 +-
 libpurple/protocols/yahoo/libyahoojp.h |   2 +-
 libpurple/protocols/yahoo/libymsg.c    |   0 
 libpurple/protocols/yahoo/libymsg.h    |   8 +++---
 7 files changed, 20 insertions(+), 29 deletions(-)

diffs (144 lines):

diff --git a/libpurple/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am
+++ b/libpurple/protocols/yahoo/Makefile.am
@@ -4,11 +4,13 @@ EXTRA_DIST = \
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
 YAHOOSOURCES = \
-	libymsg.c \
-	libymsg.h \
 	util.c \
 	yahoochat.h \
 	yahoochat.c \
+	yahoo.c \
+	yahoo.h \
+	yahoojp.c \
+	yahoojp.h \
 	yahoo_aliases.c \
 	yahoo_aliases.h \
 	yahoo_doodle.h \
@@ -23,38 +25,27 @@ YAHOOSOURCES = \
 	yahoo_picture.h \
 	yahoo_profile.c \
 	ycht.c \
-	ycht.h
+	ycht.h \
+	ymsg.c \
+	ymsg.h
 
 AM_CFLAGS = $(st)
 
 libyahoo_la_LDFLAGS = -module -avoid-version
-libyahoojp_la_LDFLAGS = -module -avoid-version
 
 if STATIC_YAHOO
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES  = libymsg.la
-libymsg_la_SOURCES = $(YAHOOSOURCES) \
-	libyahoo.c \
-	libyahoo.h \
-	libyahoojp.c \
-	libyahoojp.h
-
-libymsg_la_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES  = libyahoo.la
+libyahoo_la_SOURCES = $(YAHOOSOURCES)
+libyahoo_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES     = libymsg.la libyahoo.la libyahoojp.la
-
-libymsg_la_SOURCES = $(YAHOOSOURCES)
-libymsg_la_LIBADD  = $(GLIB_LIBS)
-
-libyahoo_la_SOURCES = libyahoo.c libyahoo.h
-libyahoo_la_LIBADD = libymsg.la
-
-libyahoojp_la_SOURCES = libyahoojp.c libyahoojp.h
-libyahoojp_la_LIBADD = libymsg.la
+pkg_LTLIBRARIES     = libyahoo.la
+libyahoo_la_SOURCES = $(YAHOOSOURCES)
+libyahoo_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/yahoo.c
rename from libpurple/protocols/yahoo/libyahoo.c
rename to libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -27,7 +27,7 @@
 #include <core.h>
 #include <plugins.h>
 
-#include "libyahoo.h"
+#include "yahoo.h"
 #include "libymsg.h"
 #include "yahoochat.h"
 #include "yahoo_aliases.h"
diff --git a/libpurple/protocols/yahoo/libyahoo.h b/libpurple/protocols/yahoo/yahoo.h
rename from libpurple/protocols/yahoo/libyahoo.h
rename to libpurple/protocols/yahoo/yahoo.h
diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/yahoojp.c
rename from libpurple/protocols/yahoo/libyahoojp.c
rename to libpurple/protocols/yahoo/yahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c
+++ b/libpurple/protocols/yahoo/yahoojp.c
@@ -26,7 +26,7 @@
 #include <account.h>
 #include <plugins.h>
 
-#include "libyahoojp.h"
+#include "yahoojp.h"
 #include "libymsg.h"
 #include "yahoochat.h"
 #include "yahoo_aliases.h"
diff --git a/libpurple/protocols/yahoo/libyahoojp.h b/libpurple/protocols/yahoo/yahoojp.h
rename from libpurple/protocols/yahoo/libyahoojp.h
rename to libpurple/protocols/yahoo/yahoojp.h
--- a/libpurple/protocols/yahoo/libyahoojp.h
+++ b/libpurple/protocols/yahoo/yahoojp.h
@@ -22,7 +22,7 @@
 #ifndef _YAHOOJP_H_
 #define _YAHOOJP_H_
 
-#include "libyahoo.h"
+#include "yahoo.h"
 
 #define YAHOOJP_TYPE_PROTOCOL             (yahoojp_protocol_get_type())
 #define YAHOOJP_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), YAHOOJP_TYPE_PROTOCOL, YahooJPProtocol))
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/ymsg.c
rename from libpurple/protocols/yahoo/libymsg.c
rename to libpurple/protocols/yahoo/ymsg.c
diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/ymsg.h
rename from libpurple/protocols/yahoo/libymsg.h
rename to libpurple/protocols/yahoo/ymsg.h
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/ymsg.h
@@ -1,5 +1,5 @@
 /**
- * @file libymsg.h The Yahoo! and Yahoo! JAPAN Protocol Plugins
+ * @file ymsg.h The Yahoo! and Yahoo! JAPAN Protocols
  *
  * purple
  *
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifndef _LIBYMSG_H_
-#define _LIBYMSG_H_
+#ifndef _YMSG_H_
+#define _YMSG_H_
 
 #include "circularbuffer.h"
 #include "cmds.h"
@@ -398,4 +398,4 @@ gchar* yahoo_get_cookies(PurpleConnectio
 /* send p2p pkt containing our encoded ip, asking peer to connect to us */
 void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13);
 
-#endif /* _LIBYMSG_H_ */
+#endif /* _YMSG_H_ */