Menu
▾
▴
[Gaim-commits] CVS: gaim/plugins .cvsignore,1.3,1.4 Makefile.am,1.65,1.66 autorecon.c,1.18,1.19 chatlist.c,1.21,1.22 history.c,1.5,1.6 iconaway.c,1.19,1.20 idle.c,1.2,1.3 mailchk.c,1.8,1.9 notify.c,1.22,1.23 spellchk.c,1.28,1.29 timestamp.c,1.5,1.6
|
From: Christian H. <ch...@us...> - 2003-01-05 03:02:58
|
Update of /cvsroot/gaim/gaim/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv3888/plugins Modified Files: .cvsignore Makefile.am autorecon.c chatlist.c history.c iconaway.c idle.c mailchk.c notify.c spellchk.c timestamp.c Log Message: Much needed Makefile.am cleanups. Sorry for the large mass of commit e-mails, everyone. These changes should work on older versions of automake and newer versions. If you do have a problem, let me know, but it should be a smooth transition. Index: .cvsignore =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 14 Oct 2002 18:42:10 -0000 1.3 +++ .cvsignore 5 Jan 2003 03:02:52 -0000 1.4 @@ -4,3 +4,5 @@ autorecon.dll iconaway.dll spellchk.dll +*.la +*.lo Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/Makefile.am,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- Makefile.am 20 Dec 2002 04:03:43 -0000 1.65 +++ Makefile.am 5 Jan 2003 03:02:52 -0000 1.66 @@ -1,32 +1,62 @@ SUBDIRS = docklet ticker -CFLAGS += -I\$(top_srcdir) -I\$(top_srcdir)/src -DVERSION=\"$(VERSION)\" -SUFFIXES = .c .so -.c.so: - $(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) -module -avoid-version $(PLUGIN_LIBS) - @rm -f tmp$@.lo tmp$@.o libtmp$@.la - @cp .libs/libtmp$@.so* $@ - @rm -f .libs/libtmp$@.* - -if PLUGINS - plugindir = $(libdir)/gaim -plugin_DATA = autorecon.so chatlist.so iconaway.so notify.so spellchk.so history.so timestamp.so idle.so +#CFLAGS += -I\$(top_srcdir) -I\$(top_srcdir)/src -DVERSION=\"$(VERSION)\" $(DEBUG_CFLAGS) -$(plugin_DATA): $(top_srcdir)/src/gaim.h -clean distclean: - rm -rf $(plugin_DATA) .libs +autorecon_la_LDFLAGS = -module -avoid-version +chatlist_la_LDFLAGS = -module -avoid-version +iconaway_la_LDFLAGS = -module -avoid-version +notify_la_LDFLAGS = -module -avoid-version +spellchk_la_LDFLAGS = -module -avoid-version +history_la_LDFLAGS = -module -avoid-version +timestamp_la_LDFLAGS = -module -avoid-version +idle_la_LDFLAGS = -module -avoid-version -else +if PLUGINS -plugin_DATA = +plugin_LTLIBRARIES = \ + autorecon.la \ + chatlist.la \ + iconaway.la \ + notify.la \ + spellchk.la \ + history.la \ + timestamp.la \ + idle.la + +autorecon_la_SOURCES = autorecon.c +chatlist_la_SOURCES = chatlist.c +iconaway_la_SOURCES = iconaway.c +notify_la_SOURCES = notify.c +spellchk_la_SOURCES = spellchk.c +history_la_SOURCES = history.c +timestamp_la_SOURCES = timestamp.c +idle_la_SOURCES = idle.c endif +EXTRA_DIST = \ + ChangeLog PERL-HOWTO HOWTO SIGNALS \ + filectl.c mailchk.c gtik.c error.c \ + gaim.pl fortuneprofile.pl + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -DVERSION=\"$(VERSION)\" \ + $(DEBUG_CFLAGS) \ + $(PLUGIN_CFLAGS) + +# +# This part allows people to build their own plugins in here. +# Yes, it's a mess. +# +SUFFIXES = .c .so +.c.so: + $(LIBTOOL) --mode=compile $(CC) $(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$@.* -EXTRA_DIST = ChangeLog PERL-HOWTO HOWTO SIGNALS autorecon.c filectl.c iconaway.c \ - notify.c spellchk.c gaim.pl mailchk.c chatlist.c gtik.c error.c \ - history.c timestamp.c fortuneprofile.pl idle.c Index: autorecon.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/autorecon.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- autorecon.c 22 Dec 2002 18:35:17 -0000 1.18 +++ autorecon.c 5 Jan 2003 03:02:52 -0000 1.19 @@ -1,4 +1,9 @@ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "gaim.h" #include "prpl.h" Index: chatlist.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/chatlist.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- chatlist.c 1 Jan 2003 03:19:07 -0000 1.21 +++ chatlist.c 5 Jan 2003 03:02:52 -0000 1.22 @@ -1,4 +1,8 @@ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif #include "pixmaps/refresh.xpm" #include "pixmaps/gnome_add.xpm" Index: history.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/history.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- history.c 22 Dec 2002 18:35:17 -0000 1.5 +++ history.c 5 Jan 2003 03:02:52 -0000 1.6 @@ -1,7 +1,12 @@ /* Puts last 4k of log in new conversations a la Everybuddy (and then * stolen by Trillian "Pro") */ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "gaim.h" #include "gtkimhtml.h" #include <sys/stat.h> Index: iconaway.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/iconaway.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- iconaway.c 22 Dec 2002 18:35:18 -0000 1.19 +++ iconaway.c 5 Jan 2003 03:02:52 -0000 1.20 @@ -1,4 +1,9 @@ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "gaim.h" #include <gtk/gtk.h> Index: idle.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/idle.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- idle.c 1 Jan 2003 03:19:08 -0000 1.2 +++ idle.c 5 Jan 2003 03:02:52 -0000 1.3 @@ -3,7 +3,12 @@ * 40-day idle times. */ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "multi.h" #include "gaim.h" #include <sys/time.h> Index: mailchk.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/mailchk.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mailchk.c 2 Jan 2003 05:20:55 -0000 1.8 +++ mailchk.c 5 Jan 2003 03:02:52 -0000 1.9 @@ -1,4 +1,9 @@ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "gaim.h" #include <sys/stat.h> #include <sys/types.h> Index: notify.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- notify.c 1 Jan 2003 03:19:08 -0000 1.22 +++ notify.c 5 Jan 2003 03:02:52 -0000 1.23 @@ -15,6 +15,8 @@ * for count of new messages option */ +#include "config.h" + #ifndef GAIM_PLUGINS #define GAIM_PLUGINS #endif Index: spellchk.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/spellchk.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- spellchk.c 1 Jan 2003 03:19:08 -0000 1.28 +++ spellchk.c 5 Jan 2003 03:02:52 -0000 1.29 @@ -8,7 +8,12 @@ * BUGS: * ? I think i fixed them all. */ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include "gaim.h" #include <string.h> Index: timestamp.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/timestamp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- timestamp.c 4 Jan 2003 21:01:14 -0000 1.5 +++ timestamp.c 5 Jan 2003 03:02:52 -0000 1.6 @@ -1,7 +1,12 @@ /* iChat-like timestamps by Sean Egan. * <INSERT GPL HERE> */ +#include "config.h" + +#ifndef GAIM_PLUGINS #define GAIM_PLUGINS +#endif + #include <time.h> #include "gaim.h" #include "gtkimhtml.h" |