changeset 27605:6a4cab3959b7

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).
author Paul Aurich <paul@darkrain42.org>
date Mon, 13 Jul 2009 17:01:52 +0000
parents 8cfc45425ac7
children 459e17946686
files finch/plugins/Makefile.am libpurple/plugins/Makefile.am pidgin/plugins/Makefile.am
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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$@.*
--- 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$@.*
--- 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$@.*