[Gaim-commits] SF.net SVN: gaim: [17209] trunk

[<the...@us...>]

Revision: 17209
          http://svn.sourceforge.net/gaim/?rev=17209&view=rev
Author:   thekingant
Date:     2006-09-09 14:32:30 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
More changes to help make dist work again.  Let's see here
* Alphabetize some stuff in gtk/Makefile.am
* Include gntwm.h in the tar.gz
* Include gntplugin.h in the tar.gz (instead of gntplugin.c (typo))
* libgaim/connection.c and libgaim/upnp.c shouldn't include gaim.h
  gaim.h should only be used by stuff outside of libgaim
* Include gaim.h in the tar.gz (not sure if we want to keep it this
  way, I'll send an email to gaim-devel in a little bit)

Modified Paths:
--------------
    trunk/console/Makefile.am
    trunk/console/libgnt/Makefile.am
    trunk/gtk/Makefile.am
    trunk/libgaim/connection.c
    trunk/libgaim/upnp.c

Modified: trunk/console/Makefile.am
===================================================================
--- trunk/console/Makefile.am	2006-09-09 21:02:31 UTC (rev 17208)
+++ trunk/console/Makefile.am	2006-09-09 21:32:30 UTC (rev 17209)
@@ -25,7 +25,7 @@
 	gntconv.h \
 	gntdebug.h \
 	gntnotify.h \
-	gntplugin.c \
+	gntplugin.h \
 	gntprefs.h \
 	gntrequest.h \
 	gntstatus.h \

Modified: trunk/console/libgnt/Makefile.am
===================================================================
--- trunk/console/libgnt/Makefile.am	2006-09-09 21:02:31 UTC (rev 17208)
+++ trunk/console/libgnt/Makefile.am	2006-09-09 21:32:30 UTC (rev 17209)
@@ -38,6 +38,7 @@
 	gnttextview.h \
 	gnttree.h \
 	gntutils.h \
+	gntwm.h \
 	gnt.h
 
 libgnt_laincludedir=$(includedir)/gnt

Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am	2006-09-09 21:02:31 UTC (rev 17208)
+++ trunk/gtk/Makefile.am	2006-09-09 21:32:30 UTC (rev 17209)
@@ -59,13 +59,14 @@
 bin_PROGRAMS = gaim
 
 gaim_SOURCES = \
+	gaimcombobox.c \
+	gaimstock.c \
 	gtkaccount.c \
 	gtkblist.c \
 	gtkcelllayout.c \
 	gtkcellrendererprogress.c \
 	gtkcellview.c \
 	gtkcellviewmenuitem.c \
-	gaimcombobox.c \
 	gtkconn.c \
 	gtkconv.c \
 	gtkdebug.c \
@@ -83,9 +84,9 @@
 	gtknotify.c \
 	gtkplugin.c \
 	gtkpluginpref.c \
+	gtkpounce.c \
 	gtkprefs.c \
 	gtkprivacy.c \
-	gtkpounce.c \
 	gtkrequest.c \
 	gtkroomlist.c \
 	gtksavedstatuses.c \
@@ -93,7 +94,6 @@
 	gtksound.c \
 	gtksourceiter.c \
 	gtkstatusbox.c \
-	gaimstock.c \
 	gtkthemes.c \
 	gtkutils.c \
 	gtkwhiteboard.c

Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c	2006-09-09 21:02:31 UTC (rev 17208)
+++ trunk/libgaim/connection.c	2006-09-09 21:32:30 UTC (rev 17209)
@@ -28,7 +28,6 @@
 #include "connection.h"
 #include "dbus-maybe.h"
 #include "debug.h"
-#include "gaim.h"
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"

Modified: trunk/libgaim/upnp.c
===================================================================
--- trunk/libgaim/upnp.c	2006-09-09 21:02:31 UTC (rev 17208)
+++ trunk/libgaim/upnp.c	2006-09-09 21:32:30 UTC (rev 17209)
@@ -23,7 +23,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "internal.h"
-#include "gaim.h"
 
 #include "debug.h"
 #include "util.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.