/soc/2013/ankitkv/gobjectification: a3ef1c1c7b55: Temporarily di...

Ankit Vani a at nevitus.org
Sun Jul 28 12:06:06 EDT 2013


Changeset: a3ef1c1c7b55dbc4781bca4683bfca9ed540bf92
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-28 21:35 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/a3ef1c1c7b55

Description:

Temporarily disabled building of plugins

diffstat:

 finch/plugins/Makefile.am       |  122 +++++++-------
 libpurple/plugins/Makefile.am   |  328 ++++++++++++++++++++--------------------
 libpurple/protocols/Makefile.am |   10 +-
 pidgin/plugins/Makefile.am      |  280 +++++++++++++++++-----------------
 4 files changed, 370 insertions(+), 370 deletions(-)

diffs (truncated from 762 to 300 lines):

diff --git a/finch/plugins/Makefile.am b/finch/plugins/Makefile.am
--- a/finch/plugins/Makefile.am
+++ b/finch/plugins/Makefile.am
@@ -1,63 +1,63 @@
-gntclipboard_la_LDFLAGS = -module -avoid-version
-gntgf_la_LDFLAGS      = -module -avoid-version
-gnthistory_la_LDFLAGS = -module -avoid-version
-gntlastlog_la_LDFLAGS = -module -avoid-version
-gnttinyurl_la_LDFLAGS = -module -avoid-version
-grouping_la_LDFLAGS   = -module -avoid-version
-
-if PLUGINS
-
-plugin_LTLIBRARIES = \
-	gntclipboard.la \
-	gntgf.la \
-	gnthistory.la \
-	gntlastlog.la \
-	gnttinyurl.la \
-	grouping.la
-
-plugindir = $(libdir)/finch
-
-gntclipboard_la_SOURCES = gntclipboard.c
-gntgf_la_SOURCES      = gntgf.c
-gnthistory_la_SOURCES = gnthistory.c
-gntlastlog_la_SOURCES = lastlog.c
-gnttinyurl_la_SOURCES = gnttinyurl.c
-grouping_la_SOURCES   = grouping.c
-
-gntclipboard_la_CFLAGS = $(X11_CFLAGS)
-gntgf_la_CFLAGS = $(X11_CFLAGS)
-
-gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
-gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
-gnthistory_la_LIBADD  = $(GLIB_LIBS)
-gntlastlog_la_LIBADD  = $(GLIB_LIBS)
-gnttinyurl_la_LIBADD  = $(GLIB_LIBS)
-grouping_la_LIBADD    = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
-
-endif # PLUGINS
-
-EXTRA_DIST = pietray.py
-
-AM_CPPFLAGS = \
-	-DDATADIR=\"$(datadir)\" \
-	-I$(top_builddir)/libpurple \
-	-I$(top_srcdir)/libpurple \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/finch \
-	-I$(top_srcdir)/finch/libgnt \
-	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GNT_CFLAGS) \
-	$(PLUGIN_CFLAGS)
-
+#gntclipboard_la_LDFLAGS = -module -avoid-version
+#gntgf_la_LDFLAGS      = -module -avoid-version
+#gnthistory_la_LDFLAGS = -module -avoid-version
+#gntlastlog_la_LDFLAGS = -module -avoid-version
+#gnttinyurl_la_LDFLAGS = -module -avoid-version
+#grouping_la_LDFLAGS   = -module -avoid-version
 #
-# This part allows people to build their own plugins in here.
-# Yes, it's a mess.
+#if PLUGINS
 #
-SUFFIXES = .c .so
-.c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
-	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
-	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
-	@cp .libs/libtmp$@.so.so $@
-	@rm -rf .libs/libtmp$@.*
+#plugin_LTLIBRARIES = \
+#	gntclipboard.la \
+#	gntgf.la \
+#	gnthistory.la \
+#	gntlastlog.la \
+#	gnttinyurl.la \
+#	grouping.la
+#
+#plugindir = $(libdir)/finch
+#
+#gntclipboard_la_SOURCES = gntclipboard.c
+#gntgf_la_SOURCES      = gntgf.c
+#gnthistory_la_SOURCES = gnthistory.c
+#gntlastlog_la_SOURCES = lastlog.c
+#gnttinyurl_la_SOURCES = gnttinyurl.c
+#grouping_la_SOURCES   = grouping.c
+#
+#gntclipboard_la_CFLAGS = $(X11_CFLAGS)
+#gntgf_la_CFLAGS = $(X11_CFLAGS)
+#
+#gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
+#gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
+#gnthistory_la_LIBADD  = $(GLIB_LIBS)
+#gntlastlog_la_LIBADD  = $(GLIB_LIBS)
+#gnttinyurl_la_LIBADD  = $(GLIB_LIBS)
+#grouping_la_LIBADD    = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
+#
+#endif # PLUGINS
+#
+#EXTRA_DIST = pietray.py
+#
+#AM_CPPFLAGS = \
+#	-DDATADIR=\"$(datadir)\" \
+#	-I$(top_builddir)/libpurple \
+#	-I$(top_srcdir)/libpurple \
+#	-I$(top_srcdir) \
+#	-I$(top_srcdir)/finch \
+#	-I$(top_srcdir)/finch/libgnt \
+#	$(DEBUG_CFLAGS) \
+#	$(GLIB_CFLAGS) \
+#	$(GNT_CFLAGS) \
+#	$(PLUGIN_CFLAGS)
+#
+##
+## This part allows people to build their own plugins in here.
+## Yes, it's a mess.
+##
+#SUFFIXES = .c .so
+#.c.so:
+#	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+#	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
+#	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
+#	@cp .libs/libtmp$@.so.so $@
+#	@rm -rf .libs/libtmp$@.*
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -1,166 +1,166 @@
-DIST_SUBDIRS = mono perl ssl tcl keyrings
-
-if USE_PERL
-PERL_DIR = perl
-endif
-
-if USE_TCL
-TCL_DIR = tcl
-endif
-
-if ENABLE_DBUS
-DBUS_LTLIB = dbus-example.la
-endif
-
-if USE_MONO
-MONO_DIR = mono
-endif
-
-SUBDIRS = \
-	$(MONO_DIR) \
-	$(PERL_DIR) \
-	ssl \
-	$(TCL_DIR) \
-	keyrings
-
-plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-
-autoaccept_la_LDFLAGS       = -module -avoid-version
-buddynote_la_LDFLAGS        = -module -avoid-version
-ciphertest_la_LDFLAGS		= -module -avoid-version
-codeinline_la_LDFLAGS		= -module -avoid-version
-debug_example_la_LDFLAGS    = -module -avoid-version
-helloworld_la_LDFLAGS       = -module -avoid-version
-idle_la_LDFLAGS             = -module -avoid-version
-joinpart_la_LDFLAGS         = -module -avoid-version
-log_reader_la_LDFLAGS       = -module -avoid-version
-newline_la_LDFLAGS          = -module -avoid-version
-notify_example_la_LDFLAGS   = -module -avoid-version
-offlinemsg_la_LDFLAGS       = -module -avoid-version
-one_time_password_la_LDFLAGS	= -module -avoid-version
-pluginpref_example_la_LDFLAGS = -module -avoid-version
-psychic_la_LDFLAGS          = -module -avoid-version
-signals_test_la_LDFLAGS		= -module -avoid-version
-simple_la_LDFLAGS			= -module -avoid-version
-statenotify_la_LDFLAGS      = -module -avoid-version
-
-# this can't be in a conditional otherwise automake 1.4 yells
-dbus_example_la_LDFLAGS     = -module -avoid-version
-
-if PLUGINS
-
-plugin_LTLIBRARIES = \
-	autoaccept.la       \
-	buddynote.la        \
-	idle.la             \
-	joinpart.la         \
-	log_reader.la       \
-	newline.la          \
-	offlinemsg.la       \
-	psychic.la          \
-	statenotify.la      \
-	$(DBUS_LTLIB)
-
-noinst_LTLIBRARIES = \
-	ciphertest.la \
-	codeinline.la \
-	debug_example.la \
-	helloworld.la \
-	notify_example.la \
-	one_time_password.la \
-	pluginpref_example.la \
-	signals_test.la \
-	simple.la
-
-autoaccept_la_SOURCES       = autoaccept.c
-buddynote_la_SOURCES        = buddynote.c
-ciphertest_la_SOURCES		= ciphertest.c
-codeinline_la_SOURCES		= codeinline.c
-debug_example_la_SOURCES = debug_example.c
-helloworld_la_SOURCES       = helloworld.c
-idle_la_SOURCES             = idle.c
-joinpart_la_SOURCES         = joinpart.c
-log_reader_la_SOURCES       = log_reader.c
-newline_la_SOURCES          = newline.c
-notify_example_la_SOURCES   = notify_example.c
-offlinemsg_la_SOURCES       = offlinemsg.c
-one_time_password_la_SOURCES	= one_time_password.c
-pluginpref_example_la_SOURCES = pluginpref_example.c
-psychic_la_SOURCES          = psychic.c
-signals_test_la_SOURCES		= signals-test.c
-simple_la_SOURCES			= simple.c
-statenotify_la_SOURCES      = statenotify.c
-
-autoaccept_la_LIBADD        = $(GLIB_LIBS)
-buddynote_la_LIBADD         = $(GLIB_LIBS)
-ciphertest_la_LIBADD		= $(GLIB_LIBS)
-codeinline_la_LIBADD		= $(GLIB_LIBS)
-idle_la_LIBADD              = $(GLIB_LIBS)
-joinpart_la_LIBADD          = $(GLIB_LIBS)
-log_reader_la_LIBADD        = $(GLIB_LIBS)
-newline_la_LIBADD           = $(GLIB_LIBS)
-notify_example_la_LIBADD    = $(GLIB_LIBS)
-offlinemsg_la_LIBADD        = $(GLIB_LIBS)
-one_time_password_la_LIBADD = $(GLIB_LIBS)
-pluginpref_example_la_LIBADD = $(GLIB_LIBS)
-psychic_la_LIBADD           = $(GLIB_LIBS)
-signals_test_la_LIBADD		= $(GLIB_LIBS)
-simple_la_LIBADD			= $(GLIB_LIBS)
-statenotify_la_LIBADD       = $(GLIB_LIBS)
-
-if ENABLE_DBUS
-
-CLEANFILES              = dbus-example-bindings.c
-dbus_example_la_SOURCES = dbus-example.c
-
-dbus_example_la_LIBADD      = $(GLIB_LIBS) $(DBUS_LIBS)
-
-.PHONY: always
-
-$(top_builddir)/libpurple/dbus-types.h: always
-	cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
-
-dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
-	cat $(srcdir)/$(dbus_example_la_SOURCES) | \
-	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
-
-$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libpurple/dbus-types.h
-
-
-endif # ENABLE_DBUS
-
-endif # PLUGINS
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	dbus-buddyicons-example.py \
-	filectl.c \
-	fortuneprofile.pl \
-	ipc-test-client.c \
-	ipc-test-server.c \
-	startup.py
-
-AM_CPPFLAGS = \
-	-DDATADIR=\"$(datadir)\" \
-	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple \
-	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(PLUGIN_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(NSS_CFLAGS)
-
-PLUGIN_LIBS = \
-	$(NSS_LIBS)
-
+#DIST_SUBDIRS = mono perl ssl tcl keyrings
 #
-# This part allows people to build their own plugins in here.
-# Yes, it's a mess.
+#if USE_PERL
+#PERL_DIR = perl
+#endif
 #
-SUFFIXES = .c .so
-.c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
-	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
-	@rm -f tmp$@.lo tmp$@.o libtmp$@.la



More information about the Commits mailing list