/soc/2013/ankitkv/gobjectification: 5739f1f04078: Build a single...

[Ankit Vani]

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

Description:

Build a single library for oscar.
Renamed lib{aim|icq}.[ch] to {aim|icq}.[ch].

diffstat:

 libpurple/protocols/oscar/Makefile.am |  25 +++++++++----------------
 libpurple/protocols/oscar/libaim.c    |   2 +-
 libpurple/protocols/oscar/libaim.h    |   6 +++---
 libpurple/protocols/oscar/libicq.c    |   2 +-
 libpurple/protocols/oscar/libicq.h    |   6 +++---
 5 files changed, 17 insertions(+), 24 deletions(-)

diffs (133 lines):

diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -7,6 +7,8 @@ pkgdir = $(libdir)/purple-$(PURPLE_MAJOR
 
 OSCARSOURCES = \
 	authorization.c     \
+	aim.c               \
+	aim.h               \
 	bstream.c           \
 	clientlogin.c       \
 	encoding.c          \
@@ -28,7 +30,9 @@ OSCARSOURCES = \
 	family_stats.c      \
 	family_userlookup.c \
 	flap_connection.c   \
-	misc.c         \
+	icq.c               \
+	icq.h               \
+	misc.c              \
 	msgcookie.c         \
 	odc.c               \
 	oft.c               \
@@ -50,33 +54,22 @@ OSCARSOURCES = \
 
 AM_CFLAGS = $(st)
 
-libaim_la_LDFLAGS = -module -avoid-version
-libicq_la_LDFLAGS = -module -avoid-version
+liboscar_la_LDFLAGS = -module -avoid-version
+
 if STATIC_OSCAR
 
 st = -DPURPLE_STATIC_PRPL
 noinst_LTLIBRARIES  = liboscar.la
-liboscar_la_SOURCES = $(OSCARSOURCES) \
-	libaim.c \
-	libaim.h \
-	libicq.c \
-	libicq.h
-
+liboscar_la_SOURCES = $(OSCARSOURCES)
 liboscar_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES     = liboscar.la libaim.la libicq.la
+pkg_LTLIBRARIES     = liboscar.la
 liboscar_la_SOURCES = $(OSCARSOURCES)
 liboscar_la_LIBADD  = $(GLIB_LIBS)
 
-libaim_la_SOURCES   = libaim.c libaim.h
-libaim_la_LIBADD    = liboscar.la
-
-libicq_la_SOURCES   = libicq.c libicq.h
-libicq_la_LIBADD    = liboscar.la
-
 endif
 
 AM_CPPFLAGS = \
diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/aim.c
rename from libpurple/protocols/oscar/libaim.c
rename to libpurple/protocols/oscar/aim.c
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/aim.c
@@ -24,7 +24,7 @@
  * which contains all the shared implementation code with libicq
  */
 
-#include "libaim.h"
+#include "aim.h"
 
 #include "core.h"
 #include "plugins.h"
diff --git a/libpurple/protocols/oscar/libaim.h b/libpurple/protocols/oscar/aim.h
rename from libpurple/protocols/oscar/libaim.h
rename to libpurple/protocols/oscar/aim.h
--- a/libpurple/protocols/oscar/libaim.h
+++ b/libpurple/protocols/oscar/aim.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#ifndef _LIBAIM_H_
-#define _LIBAIM_H_
+#ifndef _AIM_H_
+#define _AIM_H_
 
 #include "oscar.h"
 
@@ -46,4 +46,4 @@ typedef struct _AIMProtocolClass
  */
 GType aim_protocol_get_type(void);
 
-#endif /* _LIBAIM_H_ */
+#endif /* _AIM_H_ */
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/icq.c
rename from libpurple/protocols/oscar/libicq.c
rename to libpurple/protocols/oscar/icq.c
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/icq.c
@@ -24,7 +24,7 @@
  * which contains all the shared implementation code with libaim
  */
 
-#include "libicq.h"
+#include "icq.h"
 
 #include "core.h"
 #include "plugins.h"
diff --git a/libpurple/protocols/oscar/libicq.h b/libpurple/protocols/oscar/icq.h
rename from libpurple/protocols/oscar/libicq.h
rename to libpurple/protocols/oscar/icq.h
--- a/libpurple/protocols/oscar/libicq.h
+++ b/libpurple/protocols/oscar/icq.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#ifndef _LIBICQ_H_
-#define _LIBICQ_H_
+#ifndef _ICQ_H_
+#define _ICQ_H_
 
 #include "oscar.h"
 
@@ -46,4 +46,4 @@ typedef struct _ICQProtocolClass
  */
 GType icq_protocol_get_type(void);
 
-#endif /* _LIBICQ_H_ */
+#endif /* _ICQ_H_ */