pidgin: 1eabe411: Fix building individual plugins on OS X....

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Jul 13 13:10:37 EDT 2009


-----------------------------------------------------------------
Revision: 1eabe411b9ca08910b0d1e837bd36a2ed05ac3db
Ancestor: 594850f8db917907cfbe4e663f141b9b11ce9ec4
Author: darkrain42 at pidgin.im
Date: 2009-07-13T17:01:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1eabe411b9ca08910b0d1e837bd36a2ed05ac3db

Modified files:
        finch/plugins/Makefile.am libpurple/plugins/Makefile.am
        pidgin/plugins/Makefile.am

ChangeLog: 

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).

-------------- next part --------------
============================================================
--- finch/plugins/Makefile.am	cf07fff086ac9b82f5b0a20aab55b353a45b5c94
+++ finch/plugins/Makefile.am	5647b306afccce1e0f026f7a8f544178e8e955ac
@@ -59,5 +59,5 @@ SUFFIXES = .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 -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@.so.so $@
+	@rm -rf .libs/libtmp$@.*
============================================================
--- libpurple/plugins/Makefile.am	c3f784e56b866f5f79255088fea6a324ae459ccc
+++ libpurple/plugins/Makefile.am	972326eb3a3e22c83b8e02756d137311d828bc60
@@ -157,5 +157,5 @@ SUFFIXES = .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 -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@.so.so $@
+	@rm -rf .libs/libtmp$@.*
============================================================
--- pidgin/plugins/Makefile.am	f781c9b9509bb4f112643cd9a60265c3e419e75c
+++ pidgin/plugins/Makefile.am	a0765d3c24c206f56bffac913997c2c0023d0199
@@ -140,5 +140,5 @@ SUFFIXES = .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 -f .libs/libtmp$@.*
+	@cp .libs/libtmp$@.so.so $@
+	@rm -rf .libs/libtmp$@.*


More information about the Commits mailing list