pidgin.win32.autotools: 5ecf86cb: Build the themeeditor plugin on Windows ...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 5ecf86cbe0f010f777d19ea836281dde5c54f27e
Parent:   6f7d14a00a1239b36b16ea4a4599be0dbb65e241
Author:   datallah at pidgin.im
Date:     11/04/10 14:27:08
Branch:   im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/5ecf86cbe0f010f777d19ea836281dde5c54f27e

Changelog: 

Build the themeeditor plugin on Windows through the autotools build.
Also a couple other minor cleanups.

Changes against parent 6f7d14a00a1239b36b16ea4a4599be0dbb65e241

  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/gestures/Makefile.am

-------------- next part --------------
============================================================
--- pidgin/plugins/gestures/Makefile.am	65b59266460892febc24ca992633918fdeb0d2fa
+++ pidgin/plugins/gestures/Makefile.am	5dbf4bc7eaa29a9cad913b621cc3dad5c1e865f1
@@ -4,7 +4,7 @@ endif
 plugindir = $(libdir)/pidgin
 endif
 
-gestures_la_LDFLAGS = -module -avoid-version
+gestures_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 if PLUGINS
 
@@ -17,7 +17,7 @@ gestures_la_SOURCES = \
 	stroke.c \
 	stroke-draw.c
 
-gestures_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
+gestures_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS) $(GLIB_LIBS)
 
 endif
 
@@ -28,3 +28,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/libpurple/win32 \
+	-I$(top_srcdir)/pidgin/win32
+endif
\ No newline at end of file
============================================================
--- pidgin/plugins/Makefile.am	2f43479eb3ca3abfe9026c5e247140e7cedca81b
+++ pidgin/plugins/Makefile.am	ed3b139362e9dcb052f8592dbcce862a7d1d4e77
@@ -53,11 +53,8 @@ xmppconsole_la_LDFLAGS      = -module -a
 timestamp_format_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 vvconfig_la_LDFLAGS         = -module -avoid-version $(NO_UNDEFINED)
 xmppconsole_la_LDFLAGS      = -module -avoid-version $(NO_UNDEFINED)
+themeedit_la_LDFLAGS        = -module -avoid-version $(NO_UNDEFINED)
 
-if !OS_WIN32
-themeedit_la_LDFLAGS        = -module -avoid-version
-endif
-
 if PLUGINS
 
 plugin_LTLIBRARIES = \
@@ -72,14 +69,10 @@ plugin_LTLIBRARIES = \
 	relnot.la           \
 	sendbutton.la       \
 	spellchk.la         \
+	themeedit.la        \
 	timestamp.la        \
 	timestamp_format.la \
 	xmppconsole.la
-	
-if !OS_WIN32
-plugin_LTLIBRARIES += \
-	themeedit.la
-endif
 
 if USE_VV
 plugin_LTLIBRARIES +=	vvconfig.la
@@ -102,15 +95,12 @@ spellchk_la_SOURCES         = spellchk.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
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
 vvconfig_la_SOURCES         = vvconfig.c
 xmppconsole_la_SOURCES      = xmppconsole.c
 
-if !OS_WIN32
-themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
-endif
-
 convcolors_la_LIBADD        = $(GTK_LIBS) $(PIDGIN_LIBS)
 contact_priority_la_LIBADD  = $(GTK_LIBS) $(PIDGIN_LIBS)
 extplacement_la_LIBADD      = $(GTK_LIBS) $(PIDGIN_LIBS)
@@ -124,6 +114,7 @@ spellchk_la_LIBADD          = $(GTK_LIBS
 relnot_la_LIBADD            = $(GLIB_LIBS) $(PIDGIN_LIBS)
 sendbutton_la_LIBADD        = $(GTK_LIBS) $(PIDGIN_LIBS)
 spellchk_la_LIBADD          = $(GTK_LIBS) $(PIDGIN_LIBS)
+themeedit_la_LIBADD         = $(GTK_LIBS) $(PIDGIN_LIBS)
 timestamp_la_LIBADD         = $(GTK_LIBS) $(PIDGIN_LIBS)
 timestamp_format_la_LIBADD  = $(GTK_LIBS) $(PIDGIN_LIBS)
 vvconfig_la_LIBADD          = $(GTK_LIBS) $(GSTREAMER_LIBS) $(PIDGIN_LIBS)
@@ -159,7 +150,7 @@ SUFFIXES = .c .so
 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)
+	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(NO_UNDEFINED) $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@*.so $@
 	@rm -rf .libs/libtmp$@.*