# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 983219907 0
# Node ID 4ebde910e95cce80ba4ae9e5f97d894cb783e8b3
# Parent  171c64f70b66f828682a75c5f8c7aa40648fc5c9
[gaim-migrate @ 1516]
fixed parallel builds for plugins, added notes in plugins/ChangeLog.

committer: Tailor Script <tailor@pidgin.im>

diff -r 171c64f70b66 -r 4ebde910e95c ChangeLog
--- a/ChangeLog	Sun Feb 25 23:17:58 2001 +0000
+++ b/ChangeLog	Mon Feb 26 20:38:27 2001 +0000
@@ -17,6 +17,8 @@
 	* Log Viewer (courtesy BMiller)
 	* Can save conversation history
 	* Napster can kinda sorta download files sometimes :)
+	* You can activate IDs in Yahoo
+	* ICQ upgraded to use icqlib 1.1.5
 
 version 0.11.0-pre4:
 	* ICQ upgraded to use icqlib 1.1.0
diff -r 171c64f70b66 -r 4ebde910e95c STATUS
--- a/STATUS	Sun Feb 25 23:17:58 2001 +0000
+++ b/STATUS	Mon Feb 26 20:38:27 2001 +0000
@@ -1,4 +1,4 @@
-STATUS of GAIM CVS tree. Last modified $Date: 2001-02-24 04:34:46 -0500 (Sat, 24 Feb 2001) $ by $Author: warmenhoven $.
+STATUS of GAIM CVS tree. Last modified $Date: 2001-02-26 15:38:27 -0500 (Mon, 26 Feb 2001) $ by $Author: warmenhoven $.
 
 This file is meant to provide gaim users who use the CVS version to see whether
 they actually want to compile what they just checked out. Gaim CVS is usually
@@ -21,10 +21,6 @@
 been worked out but I'm sure there are still a lot remaining. Please, if you
 get bored one day, go on a big bug hunt.
 
-I broke parallel builds. Sorry. Don't compile plugins if you want a parallel
-build. (If someone could tell me how to fix this, and still be somewhat
-portable, I'd appreciate it.)
-
 
 Buddy List
 ==========
diff -r 171c64f70b66 -r 4ebde910e95c plugins/ChangeLog
--- a/plugins/ChangeLog	Sun Feb 25 23:17:58 2001 +0000
+++ b/plugins/ChangeLog	Mon Feb 26 20:38:27 2001 +0000
@@ -1,4 +1,14 @@
-version 0.11.0:
+version 0.11.0pre5:
+	The build process for plugins has changed slightly. Everything still
+	works more or less the same from a user point of view, that is, 'make
+	file.so' will still turn file.c into a plugin. The build now uses
+	libtool in an attempt to increase portability. By using libtool the
+	act of compiling and linking has been divided into two steps (to be
+	precise it always was two but we only called gcc once; now we call
+	libtool twice). PLUGIN_CFLAGS has also been added. Any -D switches you
+	were passing in PLUGIN_LIBS should be passed in PLUGIN_CFLAGS now.
+
+version 0.11.0pre1:
 	Gaim is now multi-connection based. This represents a significant
 	change. Most of the code was modified, though most of the modifications
 	were small (referencing an int as part of a struct as opposed to as a
diff -r 171c64f70b66 -r 4ebde910e95c plugins/Makefile.am
--- a/plugins/Makefile.am	Sun Feb 25 23:17:58 2001 +0000
+++ b/plugins/Makefile.am	Mon Feb 26 20:38:27 2001 +0000
@@ -1,11 +1,11 @@
 CFLAGS += -I\$(top_srcdir) -I\$(top_srcdir)/src -DVERSION=\"$(VERSION)\"
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o tmp.lo
-	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp.la -rpath $(plugindir) tmp.lo $(LIBS) $(LDFLAGS) $(PLUGIN_LIBS)
-	rm tmp.lo tmp.o libtmp.la
-	mv .libs/libtmp.so.0.0.0 $@
-	rm -rf .libs
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o tmp$<.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$<.la -rpath $(plugindir) tmp$<.lo $(LIBS) $(LDFLAGS) $(PLUGIN_LIBS)
+	rm tmp$<.lo tmp$<.o libtmp$<.la
+	mv .libs/libtmp$<.so.0.0.0 $@
+	rm -f .libs/libtmp$<.so .libs/libtmp$<.so.0 .libs/libtmp$<.a .libs/libtmp$<.la .libs/libtmp$<.lai
 
 if PLUGINS