# HG changeset patch # User Paul Aurich # Date 1247504512 0 # Node ID 6a4cab3959b7fa46e3637e3a11b6b2c39d507a78 # Parent 8cfc45425ac752da6480a636e5081fe2659468e8 Fix building individual plugins on OS X. Closes #3156. Building on OS X creates both a libtmpjoinpart.so.so and libtmpjoinpart.so.so.dSYM/ (the latter being a directory). Thus this wildcard didn't work (and the directory wasn't cleaned up). diff -r 8cfc45425ac7 -r 6a4cab3959b7 finch/plugins/Makefile.am --- a/finch/plugins/Makefile.am Mon Jul 13 05:54:20 2009 +0000 +++ b/finch/plugins/Makefile.am Mon Jul 13 17:01:52 2009 +0000 @@ -59,5 +59,5 @@ $(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 -f .libs/libtmp$@.* + @cp .libs/libtmp$@.so.so $@ + @rm -rf .libs/libtmp$@.* diff -r 8cfc45425ac7 -r 6a4cab3959b7 libpurple/plugins/Makefile.am --- a/libpurple/plugins/Makefile.am Mon Jul 13 05:54:20 2009 +0000 +++ b/libpurple/plugins/Makefile.am Mon Jul 13 17:01:52 2009 +0000 @@ -157,5 +157,5 @@ $(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 -f .libs/libtmp$@.* + @cp .libs/libtmp$@.so.so $@ + @rm -rf .libs/libtmp$@.* diff -r 8cfc45425ac7 -r 6a4cab3959b7 pidgin/plugins/Makefile.am --- a/pidgin/plugins/Makefile.am Mon Jul 13 05:54:20 2009 +0000 +++ b/pidgin/plugins/Makefile.am Mon Jul 13 17:01:52 2009 +0000 @@ -140,5 +140,5 @@ $(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 -f .libs/libtmp$@.* + @cp .libs/libtmp$@.so.so $@ + @rm -rf .libs/libtmp$@.*