/soc/2015/nakulgulati/main: 68dfb08bb602: Make file.

Nakul Gulati nakgulati at gmail.com
Thu Jun 11 04:19:11 EDT 2015


Changeset: 68dfb08bb60214ba0fb81a903d15b2990576d608
Author:	 Nakul Gulati <nakgulati at gmail.com>
Date:	 2015-06-11 16:18 +0800
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/nakulgulati/main/rev/68dfb08bb602

Description:

Make file.

diffstat:

 configure.ac                             |   5 +++-
 libpurple/protocols/Makefile.am          |   2 +-
 libpurple/protocols/Makefile.mingw       |   2 +-
 libpurple/protocols/hangouts/Makefile.am |  35 ++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diffs (98 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1422,7 +1422,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DY
 fi
 
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
+	STATIC_PRPLS="bonjour hangouts gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes" ; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -1474,6 +1474,7 @@ for i in $STATIC_PRPLS ; do
 	esac
 done
 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+AM_CONDITIONAL(STATIC_HANGOUTS, test "x$static_hangouts" = "xyes")
 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
@@ -1512,6 +1513,7 @@ AC_SUBST(DYNAMIC_PRPLS)
 for i in $DYNAMIC_PRPLS ; do
 	case $i in
 		bonjour)	dynamic_bonjour=yes ;;
+		hangouts)	dynamic_hangouts=yes ;;
 		gg)			dynamic_gg=yes ;;
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
@@ -2760,6 +2762,7 @@ AC_CONFIG_FILES([Makefile
 		   libpurple/Makefile
 		   libpurple/protocols/Makefile
 		   libpurple/protocols/bonjour/Makefile
+		   libpurple/protocols/hangouts/Makefile
 		   libpurple/protocols/gg/Makefile
 		   libpurple/protocols/irc/Makefile
 		   libpurple/protocols/jabber/Makefile
diff --git a/libpurple/protocols/Makefile.am b/libpurple/protocols/Makefile.am
--- a/libpurple/protocols/Makefile.am
+++ b/libpurple/protocols/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = Makefile.mingw
 
-DIST_SUBDIRS = bonjour gg irc jabber msn mxit novell null oscar sametime silc simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg hangouts irc jabber msn mxit novell null oscar sametime silc simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
diff --git a/libpurple/protocols/Makefile.mingw b/libpurple/protocols/Makefile.mingw
--- a/libpurple/protocols/Makefile.mingw
+++ b/libpurple/protocols/Makefile.mingw
@@ -8,7 +8,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msn mxit novell null oscar sametime silc simple yahoo bonjour
+SUBDIRS = gg irc jabber msn mxit novell null oscar sametime silc simple yahoo bonjour hangouts
 
 .PHONY: all install clean
 
diff --git a/libpurple/protocols/hangouts/Makefile.am b/libpurple/protocols/hangouts/Makefile.am
new file mode 100644
--- /dev/null
+++ b/libpurple/protocols/hangouts/Makefile.am
@@ -0,0 +1,35 @@
+#EXTRA_DIST = \
+#	Makefile.mingw
+
+pkgdir = @PURPLE_PLUGINDIR@
+
+HANGOUTSSOURCES = \
+	hangouts.h \
+	hangouts.c
+
+AM_CFLAGS = $(st)
+
+libhangouts_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+
+if STATIC_HANGOUTS
+
+st = -DPURPLE_STATIC_PRPL
+noinst_LTLIBRARIES     = libhangouts.la
+libhangouts_la_SOURCES = $(HANGOUTSSOURCES)
+libhangouts_la_CFLAGS  = $(AM_CFLAGS)
+
+else
+
+st =
+pkg_LTLIBRARIES        = libhangouts.la
+libhangouts_la_SOURCES = $(HANGOUTSSOURCES)
+libhangouts_la_LIBADD  = @PURPLE_LIBS@
+
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
+	$(GLIB_CFLAGS) \
+	$(GPLUGIN_CFLAGS) \
+	$(DEBUG_CFLAGS)



More information about the Commits mailing list