Re-enable building of plugins soc.2013.gobjectification.plugins

Mon, 16 Sep 2013 00:56:56 +0530

author
Ankit Vani <a@nevitus.org>
date
Mon, 16 Sep 2013 00:56:56 +0530
branch
soc.2013.gobjectification.plugins
changeset 36738
b8074b9f5084
parent 36737
1ce884985d2d
child 36739
472bef54ba0a

Re-enable building of plugins

finch/plugins/Makefile.am file | annotate | diff | comparison | revisions
libpurple/plugins/Makefile.am file | annotate | diff | comparison | revisions
pidgin/plugins/Makefile.am file | annotate | diff | comparison | revisions
--- a/finch/plugins/Makefile.am	Mon Sep 16 00:49:15 2013 +0530
+++ b/finch/plugins/Makefile.am	Mon Sep 16 00:56:56 2013 +0530
@@ -1,64 +1,64 @@
-#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_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) \
+	$(GPLUGIN_CFLAGS) \
+	$(GNT_CFLAGS) \
+	$(PLUGIN_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
+# This part allows people to build their own plugins in here.
+# Yes, it's a mess.
 #
-#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) \
-#	$(GPLUGIN_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$@.*
+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$@.*
--- a/libpurple/plugins/Makefile.am	Mon Sep 16 00:49:15 2013 +0530
+++ b/libpurple/plugins/Makefile.am	Mon Sep 16 00:56:56 2013 +0530
@@ -1,173 +1,167 @@
-DIST_SUBDIRS = ssl keyrings
+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
 
-#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
+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
+	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+
+dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
+	$(AM_V_GEN)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) \
+	$(GPLUGIN_CFLAGS) \
+	$(PLUGIN_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(NSS_CFLAGS)
+
+PLUGIN_LIBS = \
+	$(NSS_LIBS)
+
 #
-#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
+# This part allows people to build their own plugins in here.
+# Yes, it's a mess.
 #
-#$(top_builddir)/libpurple/dbus-types.h: always
-#	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
-#
-#dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
-#	$(AM_V_GEN)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) \
-#	$(GPLUGIN_CFLAGS) \
-#	$(PLUGIN_CFLAGS) \
-#	$(DBUS_CFLAGS) \
-#	$(NSS_CFLAGS)
-#
-#PLUGIN_LIBS = \
-#	$(NSS_LIBS)
-#
-##
-## 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 $@
-#	@rm -rf .libs/libtmp$@.*
+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 $@
+	@rm -rf .libs/libtmp$@.*
--- a/pidgin/plugins/Makefile.am	Mon Sep 16 00:49:15 2013 +0530
+++ b/pidgin/plugins/Makefile.am	Mon Sep 16 00:56:56 2013 +0530
@@ -1,143 +1,143 @@
-#DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
-#
-#if BUILD_GEVOLUTION
-#GEVOLUTION_DIR = gevolution
-#endif
-#
-#if ENABLE_DBUS
-#MUSICMESSAGING_DIR = musicmessaging
-#endif
-#
-#if ENABLE_CAP
-#CAP_DIR = cap
-#endif
-#
-#if USE_PERL
-#PERL_DIR = perl
-#endif
-#
-#if ENABLE_GESTURES
-#GESTURE_DIR = gestures
-#endif
-#
-#SUBDIRS = \
-#	$(CAP_DIR) \
-#	$(GESTURE_DIR) \
-#	$(GEVOLUTION_DIR) \
-#	$(MUSICMESSAGING_DIR) \
-#	$(PERL_DIR) \
-#	disco \
-#	ticker
-#
-#plugindir = $(libdir)/pidgin
-#
-#convcolors_la_LDFLAGS       = -module -avoid-version
-#contact_priority_la_LDFLAGS = -module -avoid-version
-#extplacement_la_LDFLAGS     = -module -avoid-version
-#gtk_signals_test_la_LDFLAGS = -module -avoid-version
-#gtkbuddynote_la_LDFLAGS     = -module -avoid-version
-#history_la_LDFLAGS          = -module -avoid-version
-#iconaway_la_LDFLAGS         = -module -avoid-version
-#markerline_la_LDFLAGS       = -module -avoid-version
-#notify_la_LDFLAGS           = -module -avoid-version
-#pidginrc_la_LDFLAGS         = -module -avoid-version
-#relnot_la_LDFLAGS           = -module -avoid-version
-#sendbutton_la_LDFLAGS       = -module -avoid-version
-#spellchk_la_LDFLAGS         = -module -avoid-version
-#themeedit_la_LDFLAGS        = -module -avoid-version
-#webkit_la_LDFLAGS           = -module -avoid-version
-#xmppconsole_la_LDFLAGS      = -module -avoid-version
-#
-#if PLUGINS
-#
-#plugin_LTLIBRARIES = \
-#	convcolors.la       \
-#	extplacement.la     \
-#	gtkbuddynote.la     \
-#	history.la          \
-#	iconaway.la         \
-#	markerline.la       \
-#	notify.la           \
-#	pidginrc.la         \
-#	relnot.la           \
-#	sendbutton.la       \
-#	spellchk.la         \
-#	themeedit.la        \
-#	webkit.la           \
-#	xmppconsole.la
-#
-#noinst_LTLIBRARIES = \
-#	contact_priority.la \
-#	gtk_signals_test.la
+DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
+
+if BUILD_GEVOLUTION
+GEVOLUTION_DIR = gevolution
+endif
+
+if ENABLE_DBUS
+MUSICMESSAGING_DIR = musicmessaging
+endif
+
+if ENABLE_CAP
+CAP_DIR = cap
+endif
+
+if USE_PERL
+PERL_DIR = perl
+endif
+
+if ENABLE_GESTURES
+GESTURE_DIR = gestures
+endif
+
+SUBDIRS = \
+	$(CAP_DIR) \
+	$(GESTURE_DIR) \
+	$(GEVOLUTION_DIR) \
+	$(MUSICMESSAGING_DIR) \
+	$(PERL_DIR) \
+	disco \
+	ticker
+
+plugindir = $(libdir)/pidgin
+
+convcolors_la_LDFLAGS       = -module -avoid-version
+contact_priority_la_LDFLAGS = -module -avoid-version
+extplacement_la_LDFLAGS     = -module -avoid-version
+gtk_signals_test_la_LDFLAGS = -module -avoid-version
+gtkbuddynote_la_LDFLAGS     = -module -avoid-version
+history_la_LDFLAGS          = -module -avoid-version
+iconaway_la_LDFLAGS         = -module -avoid-version
+markerline_la_LDFLAGS       = -module -avoid-version
+notify_la_LDFLAGS           = -module -avoid-version
+pidginrc_la_LDFLAGS         = -module -avoid-version
+relnot_la_LDFLAGS           = -module -avoid-version
+sendbutton_la_LDFLAGS       = -module -avoid-version
+spellchk_la_LDFLAGS         = -module -avoid-version
+themeedit_la_LDFLAGS        = -module -avoid-version
+webkit_la_LDFLAGS           = -module -avoid-version
+xmppconsole_la_LDFLAGS      = -module -avoid-version
+
+if PLUGINS
+
+plugin_LTLIBRARIES = \
+	convcolors.la       \
+	extplacement.la     \
+	gtkbuddynote.la     \
+	history.la          \
+	iconaway.la         \
+	markerline.la       \
+	notify.la           \
+	pidginrc.la         \
+	relnot.la           \
+	sendbutton.la       \
+	spellchk.la         \
+	themeedit.la        \
+	webkit.la           \
+	xmppconsole.la
+
+noinst_LTLIBRARIES = \
+	contact_priority.la \
+	gtk_signals_test.la
+
+convcolors_la_SOURCES       = convcolors.c
+contact_priority_la_SOURCES = contact_priority.c
+extplacement_la_SOURCES     = extplacement.c
+gtk_signals_test_la_SOURCES = gtk-signals-test.c
+gtkbuddynote_la_SOURCES     = gtkbuddynote.c
+history_la_SOURCES          = history.c
+iconaway_la_SOURCES         = iconaway.c
+markerline_la_SOURCES       = markerline.c
+notify_la_SOURCES           = notify.c
+pidginrc_la_SOURCES         = pidginrc.c
+relnot_la_SOURCES           = relnot.c
+sendbutton_la_SOURCES       = sendbutton.c
+spellchk_la_SOURCES         = spellchk.c
+themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
+webkit_la_SOURCES           = webkit.c
+xmppconsole_la_SOURCES      = xmppconsole.c
+
+convcolors_la_LIBADD        = $(GTK_LIBS)
+contact_priority_la_LIBADD  = $(GTK_LIBS)
+extplacement_la_LIBADD      = $(GTK_LIBS)
+gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
+gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
+history_la_LIBADD           = $(GTK_LIBS)
+iconaway_la_LIBADD          = $(GTK_LIBS)
+markerline_la_LIBADD        = $(GTK_LIBS) $(WEBKIT_LIBS)
+notify_la_LIBADD            = $(GTK_LIBS)
+pidginrc_la_LIBADD          = $(GTK_LIBS)
+relnot_la_LIBADD            = $(GLIB_LIBS)
+sendbutton_la_LIBADD        = $(GTK_LIBS)
+spellchk_la_LIBADD          = $(GTK_LIBS)
+themeedit_la_LIBADD         = $(GTK_LIBS)
+webkit_la_LIBADD            = $(GTK_LIBS) $(WEBKIT_LIBS)
+xmppconsole_la_LIBADD       = $(GTK_LIBS)
+
+endif # PLUGINS
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	mailchk.c \
+	pidgininc.c \
+	raw.c \
+	win32/transparency/Makefile.mingw \
+	win32/transparency/win2ktrans.c \
+	win32/winprefs/gtkappbar.c \
+	win32/winprefs/gtkappbar.h \
+	win32/winprefs/Makefile.mingw \
+	win32/winprefs/winprefs.c
+
+AM_CPPFLAGS = \
+	-DDATADIR=\"$(datadir)\" \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
+	$(DEBUG_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(GPLUGIN_CFLAGS) \
+	$(WEBKIT_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(PLUGIN_CFLAGS)
+
 #
-#convcolors_la_SOURCES       = convcolors.c
-#contact_priority_la_SOURCES = contact_priority.c
-#extplacement_la_SOURCES     = extplacement.c
-#gtk_signals_test_la_SOURCES = gtk-signals-test.c
-#gtkbuddynote_la_SOURCES     = gtkbuddynote.c
-#history_la_SOURCES          = history.c
-#iconaway_la_SOURCES         = iconaway.c
-#markerline_la_SOURCES       = markerline.c
-#notify_la_SOURCES           = notify.c
-#pidginrc_la_SOURCES         = pidginrc.c
-#relnot_la_SOURCES           = relnot.c
-#sendbutton_la_SOURCES       = sendbutton.c
-#spellchk_la_SOURCES         = spellchk.c
-#themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
-#webkit_la_SOURCES           = webkit.c
-#xmppconsole_la_SOURCES      = xmppconsole.c
-#
-#convcolors_la_LIBADD        = $(GTK_LIBS)
-#contact_priority_la_LIBADD  = $(GTK_LIBS)
-#extplacement_la_LIBADD      = $(GTK_LIBS)
-#gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
-#gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
-#history_la_LIBADD           = $(GTK_LIBS)
-#iconaway_la_LIBADD          = $(GTK_LIBS)
-#markerline_la_LIBADD        = $(GTK_LIBS) $(WEBKIT_LIBS)
-#notify_la_LIBADD            = $(GTK_LIBS)
-#pidginrc_la_LIBADD          = $(GTK_LIBS)
-#relnot_la_LIBADD            = $(GLIB_LIBS)
-#sendbutton_la_LIBADD        = $(GTK_LIBS)
-#spellchk_la_LIBADD          = $(GTK_LIBS)
-#themeedit_la_LIBADD         = $(GTK_LIBS)
-#webkit_la_LIBADD            = $(GTK_LIBS) $(WEBKIT_LIBS)
-#xmppconsole_la_LIBADD       = $(GTK_LIBS)
-#
-#endif # PLUGINS
+# This part allows people to build their own plugins in here.
+# Yes, it's a mess.
 #
-#EXTRA_DIST = \
-#	Makefile.mingw \
-#	mailchk.c \
-#	pidgininc.c \
-#	raw.c \
-#	win32/transparency/Makefile.mingw \
-#	win32/transparency/win2ktrans.c \
-#	win32/winprefs/gtkappbar.c \
-#	win32/winprefs/gtkappbar.h \
-#	win32/winprefs/Makefile.mingw \
-#	win32/winprefs/winprefs.c
-#
-#AM_CPPFLAGS = \
-#	-DDATADIR=\"$(datadir)\" \
-#	-I$(top_builddir)/libpurple \
-#	-I$(top_srcdir)/libpurple \
-#	-I$(top_srcdir)/pidgin \
-#	$(DEBUG_CFLAGS) \
-#	$(GTK_CFLAGS) \
-#	$(GPLUGIN_CFLAGS) \
-#	$(WEBKIT_CFLAGS) \
-#	$(GSTREAMER_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 $@
-#	@rm -rf .libs/libtmp$@.*
+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 $@
+	@rm -rf .libs/libtmp$@.*

mercurial