pidgin: e9bb03a6: Some versions of libtool seem to output ...

qulogic at pidgin.im qulogic at pidgin.im
Mon Jul 20 01:15:44 EDT 2009


-----------------------------------------------------------------
Revision: e9bb03a6ee65b531aedba74676ce2dbb1b9a8491
Ancestor: 5d26d6124f82c0ad970c666b58e7c76c496d9191
Author: qulogic at pidgin.im
Date: 2009-07-20T05:10:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e9bb03a6ee65b531aedba74676ce2dbb1b9a8491

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

ChangeLog: 

Some versions of libtool seem to output things a little differently, so
change the automatic plugin-building stuff to copy the right files, and
still be compatible with OS X.

-------------- next part --------------
============================================================
--- libpurple/plugins/Makefile.am	972326eb3a3e22c83b8e02756d137311d828bc60
+++ libpurple/plugins/Makefile.am	745b67aa56634bd2b67533d6be2a52ea55f01525
@@ -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.so $@
+	@cp .libs/libtmp$@*.so $@
 	@rm -rf .libs/libtmp$@.*
============================================================
--- pidgin/plugins/Makefile.am	a0765d3c24c206f56bffac913997c2c0023d0199
+++ pidgin/plugins/Makefile.am	4c2ff544daab78d70ade9775963ab7601c74eccb
@@ -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.so $@
+	@cp .libs/libtmp$@*.so $@
 	@rm -rf .libs/libtmp$@.*


More information about the Commits mailing list