huge cleanup on build system

1 files changed, 51 insertions, 4 deletions

diff --git a/xchat-wdk.patch b/xchat-wdk.patch
index 748fec6b..8a253ff5 100644
--- a/xchat-wdk.patch
+++ b/xchat-wdk.patch
@@ -323,6 +323,30 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
  #include <time.h>
  #include <signal.h>
  #include <sys/stat.h>
+diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c
+--- xchat-wdk.orig/src/common/plugin-timer.c	2005-02-02 11:03:51 +0100
++++ xchat-wdk/src/common/plugin-timer.c	2010-08-24 19:57:22 +0200
+@@ -1,7 +1,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include "xchat-plugin.h"
++#include <xchat-plugin.h>
+ 
+ #ifdef WIN32
+ #define strcasecmp stricmp
+diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c
+--- xchat-wdk.orig/src/common/plugin.c	2010-08-14 03:46:21 +0200
++++ xchat-wdk/src/common/plugin.c	2010-08-24 19:57:38 +0200
+@@ -34,7 +34,7 @@
+ #include "text.h"
+ #define PLUGIN_C
+ typedef struct session xchat_context;
+-#include "xchat-plugin.h"
++#include <xchat-plugin.h>
+ #include "plugin.h"
+ 
+ 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c
 --- xchat-wdk.orig/src/common/proto-irc.c	2010-05-30 04:28:04 +0200
 +++ xchat-wdk/src/common/proto-irc.c	2010-08-19 00:03:40 +0200
@@ -553,7 +577,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
  }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c
 --- xchat-wdk.orig/src/common/xchat.c	2008-06-08 09:58:58 +0200
-+++ xchat-wdk/src/common/xchat.c	2010-08-19 00:03:40 +0200
++++ xchat-wdk/src/common/xchat.c	2010-08-24 19:57:56 +0200
 @@ -22,7 +22,6 @@
  #include <time.h>
  #include <sys/types.h>
@@ -562,6 +586,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
  
  #define WANTSOCKET
  #include "inet.h"
+@@ -38,7 +37,7 @@
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "ignore.h"
+-#include "xchat-plugin.h"
++#include <xchat-plugin.h>
+ #include "plugin.h"
+ #include "plugin-timer.h"
+ #include "notify.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
 --- xchat-wdk.orig/src/common/xchat.h	2010-08-07 09:14:45 +0200
 +++ xchat-wdk/src/common/xchat.h	2010-08-19 00:03:40 +0200
@@ -880,15 +913,17 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
  #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c
 --- xchat-wdk.orig/src/fe-gtk/plugin-tray.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-08-19 00:03:40 +0200
-@@ -1,7 +1,6 @@
++++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-08-24 19:58:14 +0200
+@@ -1,8 +1,7 @@
  /* Copyright (C) 2006-2007 Peter Zelezny. */
  
  #include <string.h>
 -#include <unistd.h>
- #include "../common/xchat-plugin.h"
+-#include "../common/xchat-plugin.h"
++#include <xchat-plugin.h>
  #include "../common/xchat.h"
  #include "../common/xchatc.h"
+ #include "../common/inbound.h"
 @@ -298,10 +297,10 @@
  		nets = tray_count_networks ();
  		chans = tray_count_channels ();
@@ -985,6 +1020,18 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
  								word[1], network);
  
  	return XCHAT_EAT_NONE;
+diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c
+--- xchat-wdk.orig/src/fe-gtk/plugingui.c	2010-05-16 05:20:22 +0200
++++ xchat-wdk/src/fe-gtk/plugingui.c	2010-08-24 19:58:08 +0200
+@@ -35,7 +35,7 @@
+ #include "../common/xchat.h"
+ #define PLUGIN_C
+ typedef struct session xchat_context;
+-#include "../common/xchat-plugin.h"
++#include <xchat-plugin.h>
+ #include "../common/plugin.h"
+ #include "../common/util.h"
+ #include "../common/outbound.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c
 --- xchat-wdk.orig/src/fe-gtk/rawlog.c	2010-05-16 05:20:22 +0200
 +++ xchat-wdk/src/fe-gtk/rawlog.c	2010-08-19 00:03:40 +0200